diff --git a/Makefile b/Makefile index 238064e..fae2d02 100644 --- a/Makefile +++ b/Makefile @@ -63,10 +63,10 @@ prepare: check: @echo "Check ..."; \ - if [ -f ${CMAKE_UTILS_BUILD_DIR}/lib${PKGNAME}.so ]; then \ + if [ -f ${CMAKE_UTILS_BUILD_DIR}/${PKGNAME}.so ]; then \ echo "Check: OK"; \ else \ - echo "Check: ${CMAKE_UTILS_BUILD_DIR}/lib${PKGNAME}.so not found !"; \ + echo "Check: ${CMAKE_UTILS_BUILD_DIR}/${PKGNAME}.so not found !"; \ exit 1; \ fi @@ -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/source/CMakeLists.txt b/source/CMakeLists.txt index 8840d3f..e275a8f 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.9) -project(libublsettings VERSION 3.1) +project(libublsettings VERSION 0) include(GNUInstallDirs) find_package(PkgConfig REQUIRED) @@ -10,6 +10,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ -fstack-clash-protection -fcf-protection") + + add_library(${PROJECT_NAME} SHARED libublsettings.c libublsettings.h) @@ -28,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}