diff --git a/Makefile b/Makefile index 6fe60df..fae2d02 100644 --- a/Makefile +++ b/Makefile @@ -81,6 +81,8 @@ uninstall: @echo "Uninstall ..." @$(RM) "${DESTDIR}${PREFIX}/lib/${PKGNAME}".so* @$(RM) "${DESTDIR}${PREFIX}/include/${PKGNAME}".h* + @$(RM) "${DESTDIR}/lib/${PKGNAME}".so* + @$(RM) "${DESTDIR}/include/${PKGNAME}".h* @if [ -z ${DESTDIR} ]; then \ ldconfig -n ${DESTDIR}${PREFIX}/lib; \ fi diff --git a/README.md b/README.md index 500d5e5..7321359 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,13 @@ After a successful build, just use: $ sudo make uninstall ``` # Library usage -Libublsettings-ui provides 2 libraries: +Libublsettings provides library: ```C - #include + #include ``` -## ublsettings -UBL utils provides various utility functions used in ubl-settings- applications. They are divided into sections as: +## libublsettings +Library provides various utility functions used in ubl-settings- applications. They are divided into sections as: - **Dictionary functions** yon_dictionary; - **String functions** yon_char; - **String array functions** yon_char_parsed; diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 761ee99..e275a8f 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,17 +1,21 @@ cmake_minimum_required(VERSION 3.9) -project(ublsettings VERSION 0) +project(libublsettings VERSION 0) include(GNUInstallDirs) find_package(PkgConfig REQUIRED) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ -O2 -pipe -fno-plt -fexceptions \ -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ -fstack-clash-protection -fcf-protection") + + add_library(${PROJECT_NAME} SHARED - ublsettings.c - ublsettings.h) + libublsettings.c + libublsettings.h) + set(LIBRARIES pthread) @@ -26,6 +30,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE C) set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION}) set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR}) set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER ${PROJECT_NAME}.h) +set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/source/ublsettings.c b/source/libublsettings.c similarity index 99% rename from source/ublsettings.c rename to source/libublsettings.c index 211df08..2a8e337 100644 --- a/source/ublsettings.c +++ b/source/libublsettings.c @@ -1,4 +1,4 @@ -#include "ublsettings.h" +#include "libublsettings.h" // dictionary functions diff --git a/source/ublsettings.h b/source/libublsettings.h similarity index 100% rename from source/ublsettings.h rename to source/libublsettings.h