Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Cleanup junk code created by GOB #214

Merged
merged 4 commits into from
Jul 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
BasedOnStyle: LLVM
IndentWidth: 4
ColumnLimit: 100
30 changes: 8 additions & 22 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
add_library(common STATIC
IBusChewingApplier.c
IBusChewingProperties.c
IBusChewingLookupTable.c
MakerDialogBackend.c
MakerDialogProperty.c
MakerDialogUtil.c

IBusChewingLookupTable.h
IBusChewingProperties.h
MakerDialogBackend.h
MakerDialogProperty.h
MakerDialogPropertySpec.h
MakerDialogUtil.h
ibus-chewing-engine.h
)
Expand All @@ -20,19 +12,6 @@ target_link_libraries(common PUBLIC
PkgConfig::IBUS
)

add_library(gui-core STATIC
GSettingsBackend.c
GSettingsBackend.h
)
target_link_libraries(gui-core PUBLIC
common
PkgConfig::GLIB2
PkgConfig::GTK4
PkgConfig::LIBADWAITA
PkgConfig::IBUS
PkgConfig::CHEWING
)

add_custom_command(
OUTPUT ibus-setup-chewing-window-ui.c
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/setup
Expand Down Expand Up @@ -86,7 +65,14 @@ target_compile_definitions(ibus-engine-chewing
target_include_directories(ibus-engine-chewing
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

target_link_libraries(ibus-engine-chewing gui-core)
target_link_libraries(ibus-engine-chewing
common
PkgConfig::GLIB2
PkgConfig::GTK4
PkgConfig::LIBADWAITA
PkgConfig::IBUS
PkgConfig::CHEWING
)

set(PROJECT_GSCHEMA_XML ${PROJECT_SCHEMA_ID}.gschema.xml)
set(GSETTINGS_SCHEMAS_DIR ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)
Expand Down
134 changes: 0 additions & 134 deletions src/GSettingsBackend.c

This file was deleted.

59 changes: 0 additions & 59 deletions src/GSettingsBackend.h

This file was deleted.

Loading