diff --git a/development-files/kysdk-config.pc b/development-files/kysdk-config.pc index 7af5dc7..0de0427 100644 --- a/development-files/kysdk-config.pc +++ b/development-files/kysdk-config.pc @@ -5,4 +5,4 @@ Description: kysdk base layer config component Requires: kysdk-utils Version: 2.0.0 Cflags: -I/usr/include/kysdk/kysdk-base/ -Libs: -L/usr/lib/*/kysdk/kysdk-base/ -lkyconf -Wl,-rpath=/usr/lib/*/kysdk/kysdk-base/ +Libs: -lkysdk-config diff --git a/development-files/kysdk-gsetting.pc b/development-files/kysdk-gsetting.pc index aed769b..20c032c 100644 --- a/development-files/kysdk-gsetting.pc +++ b/development-files/kysdk-gsetting.pc @@ -2,5 +2,5 @@ Name: libkysdk-gsetting Description: kysdk base layer gsettings component Requires: gtk+-3.0 glib-2.0 Version: 2.0.0 -Libs: -L/usr/lib/*/kysdk/kysdk-base/ -lkygsetting -Wl,-rpath=/usr/lib/*/kysdk/kysdk-base/ +Libs: -lkysdk-gsetting Cflags: -I/usr/include/kysdk/kysdk-base/ diff --git a/development-files/kysdk-log.pc b/development-files/kysdk-log.pc index 9fff26e..aba3731 100644 --- a/development-files/kysdk-log.pc +++ b/development-files/kysdk-log.pc @@ -5,4 +5,4 @@ Description: kysdk base layer log component Requires: kysdk-config kysdk-utils libsystemd Version: 2.0.0 Cflags: -I/usr/include/kysdk/kysdk-base/ -Libs: -L/usr/lib/*/kysdk/kysdk-base/ -lkylog -Wl,-rpath=/usr/lib/*/kysdk/kysdk-base/ +Libs: -lkysdk-log diff --git a/development-files/kysdk-timer.pc b/development-files/kysdk-timer.pc index 73c0c98..b7fe592 100644 --- a/development-files/kysdk-timer.pc +++ b/development-files/kysdk-timer.pc @@ -3,4 +3,4 @@ Description: kysdk base layer time component Requires: kysdk-utils Version: 2.0.0 Cflags: -I/usr/include/kysdk/kysdk-base/ -Libs: -L/usr/lib/*/kysdk/kysdk-base/ -lkytimer -Wl,-rpath=/usr/lib/*/kysdk/kysdk-base/ +Libs: -lkysdk-timer diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt index 0974f42..956dd70 100644 --- a/src/config/CMakeLists.txt +++ b/src/config/CMakeLists.txt @@ -1,10 +1,10 @@ aux_source_directory(. SOURCESCODE) -add_library(kyconf SHARED ${SOURCESCODE}) -set_target_properties(kyconf PROPERTIES VERSION 2.0.0 SOVERSION 1) +add_library(kysdk-config SHARED ${SOURCESCODE}) +set_target_properties(kysdk-config PROPERTIES VERSION 2.0.0 SOVERSION 1) add_executable(kyconf-test-struct test/test_structlist.c) -target_link_libraries(kyconf-test-struct kyconf kylog pthread) +target_link_libraries(kyconf-test-struct kysdk-config kysdk-log pthread) -install(TARGETS kyconf +install(TARGETS kysdk-config DESTINATION ${CMAKE_INSTALL_RPATH}) install(FILES libkyconf.h diff --git a/src/gsettings/CMakeLists.txt b/src/gsettings/CMakeLists.txt index edc7aad..869b317 100755 --- a/src/gsettings/CMakeLists.txt +++ b/src/gsettings/CMakeLists.txt @@ -6,14 +6,14 @@ include_directories(${GTK3_INCLUDE_DIRS}) link_directories(${GTK3_LIBRARY_DIRS}) add_definitions(${GTK3_CFLAGS_OTHER}) -add_library(kygsetting SHARED ${SOURCESCODE}) -set_target_properties(kygsetting PROPERTIES VERSION 2.0.0 SOVERSION 1) +add_library(kysdk-gsetting SHARED ${SOURCESCODE}) +set_target_properties(kysdk-gsetting PROPERTIES VERSION 2.0.0 SOVERSION 1) add_executable(test-kygsetting test/test-gsetting.c) -target_link_libraries(kygsetting ${GTK3_LIBRARIES}) -target_link_libraries(test-kygsetting kygsetting) +target_link_libraries(kysdk-gsetting ${GTK3_LIBRARIES}) +target_link_libraries(test-kygsetting kysdk-gsetting) -install(TARGETS kygsetting +install(TARGETS kysdk-gsetting DESTINATION ${CMAKE_INSTALL_RPATH}) install(FILES libkygsetting.h diff --git a/src/log/CMakeLists.txt b/src/log/CMakeLists.txt index ac202d7..4969a09 100644 --- a/src/log/CMakeLists.txt +++ b/src/log/CMakeLists.txt @@ -4,21 +4,21 @@ include(FindPkgConfig) pkg_check_modules(DBus REQUIRED dbus-1) include_directories(${DBus_INCLUDE_DIRS}) -add_library(kylog SHARED ${SOURCESCODE}) -set_target_properties(kylog PROPERTIES VERSION 2.0.0 SOVERSION 1) +add_library(kysdk-log SHARED ${SOURCESCODE}) +set_target_properties(kysdk-log PROPERTIES VERSION 2.0.0 SOVERSION 1) add_executable(kylog-testlog test/test-log.c) add_executable(kylog-testsetdir test/test-setdir.c) add_executable(kylog-testpressure test/test-pressure.c) add_executable(kylog-testautowrap test/test-autowrap.c) find_library(SYSTEMD_LIB systemd) find_library(DBUS_LIB dbus-1) -target_link_libraries(kylog kyconf pthread ${SYSTEMD_LIB} ${DBUS_LIB}) -target_link_libraries(kylog-testlog kylog) -target_link_libraries(kylog-testsetdir kylog) -target_link_libraries(kylog-testautowrap kylog) -target_link_libraries(kylog-testpressure kylog) +target_link_libraries(kysdk-log kysdk-config pthread ${SYSTEMD_LIB} ${DBUS_LIB}) +target_link_libraries(kylog-testlog kysdk-log) +target_link_libraries(kylog-testsetdir kysdk-log) +target_link_libraries(kylog-testautowrap kysdk-log) +target_link_libraries(kylog-testpressure kysdk-log) -install(TARGETS kylog +install(TARGETS kysdk-log DESTINATION ${CMAKE_INSTALL_RPATH}) install(FILES libkylog.h diff --git a/src/log/test/Makefile b/src/log/test/Makefile index 2f52090..ce304da 100644 --- a/src/log/test/Makefile +++ b/src/log/test/Makefile @@ -1,7 +1,7 @@ all: - gcc -o test-log test-log.c -g -O0 -I../ -I../../utils/ -L../lib -L../../config/lib/ -lkylog -lkyconf -lpthread -lsystemd -Wl,-rpath=../lib:../../config/lib/ - gcc -o test-setdir test-setdir.c -g -O0 -I../ -I../../utils/ -L../lib -L../../config/lib/ -lkylog -lkyconf -lpthread -lsystemd -Wl,-rpath=../lib:../../config/lib/ - gcc -o test-pressure test-pressure.c -g -O0 -I../ -I../../utils/ -L../lib -L../../config/lib/ -lkylog -lkyconf -lpthread -lsystemd -Wl,-rpath=../lib:../../config/lib/ + gcc -o test-log test-log.c -g -O0 -I../ -I../../utils/ -L../lib -L../../config/lib/ -lkysdk-log -lkysdk-config -lpthread -lsystemd -Wl,-rpath=../lib:../../config/lib/ + gcc -o test-setdir test-setdir.c -g -O0 -I../ -I../../utils/ -L../lib -L../../config/lib/ -lkysdk-log -lkysdk-config -lpthread -lsystemd -Wl,-rpath=../lib:../../config/lib/ + gcc -o test-pressure test-pressure.c -g -O0 -I../ -I../../utils/ -L../lib -L../../config/lib/ -lkysdk-log -lkysdk-config -lpthread -lsystemd -Wl,-rpath=../lib:../../config/lib/ clean: - -rm test-log test-setdir test-pressure \ No newline at end of file + -rm test-log test-setdir test-pressure diff --git a/src/timer/CMakeLists.txt b/src/timer/CMakeLists.txt index 1b22425..c31f45f 100644 --- a/src/timer/CMakeLists.txt +++ b/src/timer/CMakeLists.txt @@ -1,11 +1,11 @@ aux_source_directory(. SOURCESCODE) -add_library(kytimer SHARED ${SOURCESCODE}) -set_target_properties(kytimer PROPERTIES VERSION 2.0.0 SOVERSION 1) +add_library(kysdk-timer SHARED ${SOURCESCODE}) +set_target_properties(kysdk-timer PROPERTIES VERSION 2.0.0 SOVERSION 1) add_executable(test-kytimer test/test-kytimer.c) -target_link_libraries(kytimer pthread) -target_link_libraries(test-kytimer kytimer) +target_link_libraries(kysdk-timer pthread) +target_link_libraries(test-kytimer kysdk-timer) -install(TARGETS kytimer +install(TARGETS kysdk-timer DESTINATION ${CMAKE_INSTALL_RPATH}) install(FILES libkytimer.h diff --git a/src/timer/test/Makefile b/src/timer/test/Makefile index 912767d..4331f2c 100644 --- a/src/timer/test/Makefile +++ b/src/timer/test/Makefile @@ -1,5 +1,5 @@ all: - gcc -g -O0 -o test-kytimer test-kytimer.c -lkytimer -lpthread + gcc -g -O0 -o test-kytimer test-kytimer.c -lkysdk-timer -lpthread clean: - rm demo \ No newline at end of file + rm demo