- create libsatsolverext static library

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba50426..8298c93 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,7 @@ SET( DOC_INSTALL_DIR
 ####################################################################
 
 #SET (CMAKE_INCLUDE_DIRECTORIES_BEFORE ON)
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR} SYSTEM )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/ext ${CMAKE_CURRENT_BINARY_DIR} SYSTEM )
 
 ####################################################################
 
@@ -129,6 +129,7 @@ set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -g -O3" )
 set ( CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS} -g3 -O0" )
 
 ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(ext)
 ADD_SUBDIRECTORY(tools)
 ADD_SUBDIRECTORY(applayer)
 ADD_SUBDIRECTORY(tests)

diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8acf8c6
--- /dev/null
+++ b/ext/CMakeLists.txt
@@ -0,0 +1,17 @@
+SET(libsatsolverext_SRCS
+    pool_fileconflicts.c repo_content.c repo_deltainfoxml.c repo_products.c
+    repo_releasefile_products.c repo_repomdxml.c repo_rpmdb.c repo_rpmmd.c
+    repo_susetags.c repo_updateinfoxml.c repo_write.c repo_zyppdb.c)
+
+ADD_LIBRARY(satsolverext STATIC ${libsatsolverext_SRCS})
+
+SET(libsatsolver_HEADERS
+    pool_fileconflicts.h repo_content.h repo_deltainfoxml.h repo_products.h
+    repo_releasefile_products.h repo_repomdxml.h repo_rpmdb.h repo_rpmmd.h
+    repo_susetags.h repo_updateinfoxml.h repo_write.h repo_zyppdb.h
+    tools_util.h)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+
+INSTALL(FILES ${libsatsolverext_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/satsolver")
+INSTALL(TARGETS satsolverext LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR})

diff --git a/tools/pool_fileconflicts.c b/ext/pool_fileconflicts.c
similarity index 100%
rename from tools/pool_fileconflicts.c
rename to ext/pool_fileconflicts.c

diff --git a/tools/pool_fileconflicts.h b/ext/pool_fileconflicts.h
similarity index 100%
rename from tools/pool_fileconflicts.h
rename to ext/pool_fileconflicts.h

diff --git a/tools/repo_content.c b/ext/repo_content.c
similarity index 100%
rename from tools/repo_content.c
rename to ext/repo_content.c

diff --git a/tools/repo_content.h b/ext/repo_content.h
similarity index 100%
rename from tools/repo_content.h
rename to ext/repo_content.h

diff --git a/tools/repo_deltainfoxml.c b/ext/repo_deltainfoxml.c
similarity index 100%
rename from tools/repo_deltainfoxml.c
rename to ext/repo_deltainfoxml.c

diff --git a/tools/repo_deltainfoxml.h b/ext/repo_deltainfoxml.h
similarity index 100%
rename from tools/repo_deltainfoxml.h
rename to ext/repo_deltainfoxml.h

diff --git a/tools/repo_products.c b/ext/repo_products.c
similarity index 100%
rename from tools/repo_products.c
rename to ext/repo_products.c

diff --git a/tools/repo_products.h b/ext/repo_products.h
similarity index 100%
rename from tools/repo_products.h
rename to ext/repo_products.h

diff --git a/tools/repo_releasefile_products.c b/ext/repo_releasefile_products.c
similarity index 100%
rename from tools/repo_releasefile_products.c
rename to ext/repo_releasefile_products.c

diff --git a/tools/repo_releasefile_products.h b/ext/repo_releasefile_products.h
similarity index 100%
rename from tools/repo_releasefile_products.h
rename to ext/repo_releasefile_products.h

diff --git a/tools/repo_repomdxml.c b/ext/repo_repomdxml.c
similarity index 100%
rename from tools/repo_repomdxml.c
rename to ext/repo_repomdxml.c

diff --git a/tools/repo_repomdxml.h b/ext/repo_repomdxml.h
similarity index 100%
rename from tools/repo_repomdxml.h
rename to ext/repo_repomdxml.h

diff --git a/tools/repo_rpmdb.c b/ext/repo_rpmdb.c
similarity index 100%
rename from tools/repo_rpmdb.c
rename to ext/repo_rpmdb.c

diff --git a/tools/repo_rpmdb.h b/ext/repo_rpmdb.h
similarity index 100%
rename from tools/repo_rpmdb.h
rename to ext/repo_rpmdb.h

diff --git a/tools/repo_rpmmd.c b/ext/repo_rpmmd.c
similarity index 100%
rename from tools/repo_rpmmd.c
rename to ext/repo_rpmmd.c

diff --git a/tools/repo_rpmmd.h b/ext/repo_rpmmd.h
similarity index 100%
rename from tools/repo_rpmmd.h
rename to ext/repo_rpmmd.h

diff --git a/tools/repo_susetags.c b/ext/repo_susetags.c
similarity index 100%
rename from tools/repo_susetags.c
rename to ext/repo_susetags.c

diff --git a/tools/repo_susetags.h b/ext/repo_susetags.h
similarity index 100%
rename from tools/repo_susetags.h
rename to ext/repo_susetags.h

diff --git a/tools/repo_updateinfoxml.c b/ext/repo_updateinfoxml.c
similarity index 100%
rename from tools/repo_updateinfoxml.c
rename to ext/repo_updateinfoxml.c

diff --git a/tools/repo_updateinfoxml.h b/ext/repo_updateinfoxml.h
similarity index 100%
rename from tools/repo_updateinfoxml.h
rename to ext/repo_updateinfoxml.h

diff --git a/tools/repo_write.c b/ext/repo_write.c
similarity index 100%
rename from tools/repo_write.c
rename to ext/repo_write.c

diff --git a/tools/repo_write.h b/ext/repo_write.h
similarity index 100%
rename from tools/repo_write.h
rename to ext/repo_write.h

diff --git a/tools/repo_zyppdb.c b/ext/repo_zyppdb.c
similarity index 100%
rename from tools/repo_zyppdb.c
rename to ext/repo_zyppdb.c

diff --git a/tools/repo_zyppdb.h b/ext/repo_zyppdb.h
similarity index 100%
rename from tools/repo_zyppdb.h
rename to ext/repo_zyppdb.h

diff --git a/tools/tools_util.h b/ext/tools_util.h
similarity index 100%
rename from tools/tools_util.h
rename to ext/tools_util.h

diff --git a/package/libsatsolver.spec.in b/package/libsatsolver.spec.in
index 6157f09..5766048 100644 (file)
--- a/package/libsatsolver.spec.in
+++ b/package/libsatsolver.spec.in
@@ -160,6 +160,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %files devel
 %defattr(-,root,root)
 %_libdir/libsatsolver.a
+%_libdir/libsatsolverext.a
 %_libdir/libappsatsolver.a
 %dir /usr/include/satsolver
 /usr/include/satsolver/*

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 576dae4..6502f4a 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -2,77 +2,60 @@
 # CMakeLists.txt for sat-solver/tools
 #
 
-# Let's not compile the same files ten times; this library is not installed
-ADD_LIBRARY( toolstuff STATIC repo_write.c common_write.c )
+ADD_LIBRARY( toolstuff STATIC common_write.c )
 
-SET(rpmdb2solv_REPOS
-  rpmdb2solv.c
-  repo_rpmdb.c
-  repo_products.c
-  repo_zyppdb.c
-  repo_releasefile_products.c
-)
+ADD_EXECUTABLE(rpmdb2solv rpmdb2solv.c)
+TARGET_LINK_LIBRARIES(rpmdb2solv toolstuff satsolverext satsolver ${RPMDB_LIBRARY} ${EXPAT_LIBRARY})
 
-ADD_EXECUTABLE( rpmdb2solv ${rpmdb2solv_REPOS} )
-TARGET_LINK_LIBRARIES( rpmdb2solv satsolver toolstuff ${RPMDB_LIBRARY} ${EXPAT_LIBRARY})
+ADD_EXECUTABLE(rpms2solv rpms2solv.c)
+TARGET_LINK_LIBRARIES(rpms2solv toolstuff satsolverext satsolver ${RPMDB_LIBRARY})
 
-SET(rpms2solv_REPOS rpms2solv.c repo_rpmdb.c )
-ADD_EXECUTABLE( rpms2solv ${rpms2solv_REPOS} )
-TARGET_LINK_LIBRARIES( rpms2solv satsolver toolstuff ${RPMDB_LIBRARY})
+ADD_EXECUTABLE(rpmmd2solv rpmmd2solv.c)
+TARGET_LINK_LIBRARIES(rpmmd2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
 
-SET(rpmmd2solv_REPOS rpmmd2solv.c repo_rpmmd.c )
-ADD_EXECUTABLE( rpmmd2solv ${rpmmd2solv_REPOS} )
-TARGET_LINK_LIBRARIES( rpmmd2solv satsolver toolstuff ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
+ADD_EXECUTABLE(helix2solv helix2solv.c ${helix2solv_REPOS} )
+TARGET_LINK_LIBRARIES(helix2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY})
 
-SET(helix2solv_REPOS helix2solv.c )
-ADD_EXECUTABLE( helix2solv ${helix2solv_REPOS} )
-TARGET_LINK_LIBRARIES( helix2solv satsolver toolstuff ${EXPAT_LIBRARY})
+ADD_EXECUTABLE(susetags2solv susetags2solv.c)
+TARGET_LINK_LIBRARIES(susetags2solv toolstuff satsolverext satsolver ${ZLIB_LIBRARY})
 
-SET(susetags2solv_REPOS susetags2solv.c repo_susetags.c repo_content.c )
-ADD_EXECUTABLE( susetags2solv ${susetags2solv_REPOS} )
-TARGET_LINK_LIBRARIES( susetags2solv satsolver toolstuff ${ZLIB_LIBRARY})
+ADD_EXECUTABLE(updateinfoxml2solv updateinfoxml2solv.c)
+TARGET_LINK_LIBRARIES(updateinfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY})
 
-SET(updateinfoxml2solv_REPOS updateinfoxml2solv.c repo_updateinfoxml.c)
-ADD_EXECUTABLE( updateinfoxml2solv ${updateinfoxml2solv_REPOS} )
-TARGET_LINK_LIBRARIES( updateinfoxml2solv satsolver toolstuff ${EXPAT_LIBRARY})
+ADD_EXECUTABLE(deltainfoxml2solv deltainfoxml2solv.c)
+TARGET_LINK_LIBRARIES(deltainfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY})
 
-SET(deltainfoxml2solv_REPOS deltainfoxml2solv.c repo_deltainfoxml.c)
-ADD_EXECUTABLE( deltainfoxml2solv ${deltainfoxml2solv_REPOS} )
-TARGET_LINK_LIBRARIES( deltainfoxml2solv satsolver toolstuff ${EXPAT_LIBRARY})
+ADD_EXECUTABLE(repomdxml2solv repomdxml2solv.c)
+TARGET_LINK_LIBRARIES(repomdxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY})
 
-SET(repomdxml2solv_REPOS repomdxml2solv.c repo_repomdxml.c)
-ADD_EXECUTABLE( repomdxml2solv ${repomdxml2solv_REPOS} )
-TARGET_LINK_LIBRARIES( repomdxml2solv satsolver toolstuff ${EXPAT_LIBRARY})
+ADD_EXECUTABLE(installcheck installcheck.c)
+TARGET_LINK_LIBRARIES(installcheck satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
 
-SET(installcheck_SOURCES installcheck.c repo_rpmmd.c repo_susetags.c)
-ADD_EXECUTABLE(installcheck ${installcheck_SOURCES})
-TARGET_LINK_LIBRARIES(installcheck satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
+ADD_EXECUTABLE(patchcheck patchcheck.c)
+TARGET_LINK_LIBRARIES(patchcheck satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
 
-SET(patchcheck_SOURCES patchcheck.c repo_rpmmd.c repo_susetags.c repo_updateinfoxml.c)
-ADD_EXECUTABLE(patchcheck ${patchcheck_SOURCES})
-TARGET_LINK_LIBRARIES(patchcheck satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
+ADD_EXECUTABLE(dumpsolv dumpsolv.c )
+TARGET_LINK_LIBRARIES(dumpsolv satsolver)
 
-ADD_EXECUTABLE( dumpsolv dumpsolv.c )
-TARGET_LINK_LIBRARIES( dumpsolv satsolver)
+ADD_EXECUTABLE(mergesolv mergesolv.c )
+TARGET_LINK_LIBRARIES(mergesolv toolstuff satsolverext satsolver)
 
-ADD_EXECUTABLE( mergesolv mergesolv.c )
-TARGET_LINK_LIBRARIES( mergesolv satsolver toolstuff)
-
-SET(findfileconflicts_SOURCES findfileconflicts.c pool_fileconflicts.c repo_rpmdb.c )
-ADD_EXECUTABLE( findfileconflicts ${findfileconflicts_SOURCES} )
-TARGET_LINK_LIBRARIES( findfileconflicts satsolver ${RPMDB_LIBRARY} ${EXPAT_LIBRARY} )
+ADD_EXECUTABLE(findfileconflicts findfileconflicts.c)
+TARGET_LINK_LIBRARIES(findfileconflicts satsolverext satsolver ${RPMDB_LIBRARY})
 
 install(TARGETS
-                mergesolv
-                dumpsolv
-                susetags2solv
-                helix2solv
-                rpmmd2solv
-                rpmdb2solv
-                rpms2solv
-                updateinfoxml2solv
-                deltainfoxml2solv
-                repomdxml2solv
-   DESTINATION ${BIN_INSTALL_DIR} )
-
-install(PROGRAMS repo2solv.sh DESTINATION ${BIN_INSTALL_DIR} )
+    mergesolv
+    dumpsolv
+    susetags2solv
+    helix2solv
+    rpmmd2solv
+    rpmdb2solv
+    rpms2solv
+    updateinfoxml2solv
+    deltainfoxml2solv
+    repomdxml2solv
+    DESTINATION ${BIN_INSTALL_DIR})
+
+install(PROGRAMS
+   repo2solv.sh
+   DESTINATION ${BIN_INSTALL_DIR})