diff options
| -rwxr-xr-x | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | packaging/minicontrol.spec | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 54279a9..5c8afbd 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,14 +52,9 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"") ADD_DEFINITIONS("-DMINICTRL_USE_DLOG") -ADD_LIBRARY(${PROJECT_NAME}-inter STATIC - src/minicontrol-internal.c -) -TARGET_LINK_LIBRARIES(${PROJECT_NAME}-inter ${pkgs_LDFLAGS}) - FOREACH(lib_file ${SUBMODULES}) - ADD_LIBRARY(${lib_file} SHARED src/${lib_file}.c) - TARGET_LINK_LIBRARIES(${lib_file} ${pkgs_LDFLAGS} ${PROJECT_NAME}-inter) + ADD_LIBRARY(${lib_file} SHARED src/${lib_file}.c src/minicontrol-internal.c) + TARGET_LINK_LIBRARIES(${lib_file} ${pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${lib_file} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${lib_file} PROPERTIES VERSION ${VERSION}) INSTALL(TARGETS ${lib_file} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) diff --git a/packaging/minicontrol.spec b/packaging/minicontrol.spec index e1122d0..644fb85 100644 --- a/packaging/minicontrol.spec +++ b/packaging/minicontrol.spec @@ -47,7 +47,6 @@ export FFLAGS+=" -fprofile-arcs -ftest-coverage" export LDFLAGS+=" -lgcov" %endif -export CFLAGS+=" -fPIC " export LDFLAGS+=" -Wl,--rpath=%{_prefix}/lib -Wl,--as-needed" LDFLAGS="$LDFLAGS" |