make it to extendible structure for adding sources and headers

Change-Id: I0366020a10cc84676a36177dd2eea5ccbcc9535c
Signed-off-by: jongmyeongko <jongmyeong.ko@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9098d8..4c53429 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(INCLUDEDIR "\${prefix}/include")
 SET(CMAKE_SKIP_BUILD_RPATH true)
 
 ### Local include directories
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/parser)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/parser/include)
 
 ### Required packages
 INCLUDE(FindPkgConfig)
@@ -38,14 +38,8 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 ADD_SUBDIRECTORY(parser)
 
 ## build pkgmgr-info library
-ADD_LIBRARY(pkgmgr-info SHARED
-       src/pkgmgrinfo_client.c
-       src/pkgmgrinfo_db.c
-       src/pkgmgrinfo_certinfo.c
-       src/pkgmgrinfo_pkginfo.c
-       src/pkgmgrinfo_appinfo.c
-       src/pkgmgrinfo_basic.c
-       src/pkgmgrinfo_private.c)
+AUX_SOURCE_DIRECTORY(src SRCS)
+ADD_LIBRARY(pkgmgr-info SHARED ${SRCS})
 
 SET_TARGET_PROPERTIES(pkgmgr-info PROPERTIES SOVERSION ${MAJORVER})
 SET_TARGET_PROPERTIES(pkgmgr-info PROPERTIES VERSION ${FULLVER})
@@ -59,9 +53,8 @@ CONFIGURE_FILE(tag_parser_list.txt.in tag_parser_list.txt @ONLY)
 
 INSTALL(TARGETS pkgmgr-info DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr-info.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/pkgmgr-info.h DESTINATION include)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/pkgmgrinfo_type.h DESTINATION include)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/pkgmgrinfo_basic.h DESTINATION include)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include
+       PATTERN "*_debug.h" EXCLUDE PATTERN "*_private.h" EXCLUDE)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/parser_path.conf DESTINATION ${SYSCONFDIR}/package-manager/)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mdparser_list.txt DESTINATION ${SYSCONFDIR}/package-manager/parserlib/metadata)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/category_parser_list.txt DESTINATION ${SYSCONFDIR}/package-manager/parserlib/category)

diff --git a/packaging/pkgmgr-info.spec b/packaging/pkgmgr-info.spec
index e993f44..16e8140 100644 (file)
--- a/packaging/pkgmgr-info.spec
+++ b/packaging/pkgmgr-info.spec
@@ -82,9 +82,7 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}-parser
 %files devel
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{_includedir}/pkgmgr-info.h
-%{_includedir}/pkgmgrinfo_type.h
-%{_includedir}/pkgmgrinfo_basic.h
+%{_includedir}/*.h
 %{_libdir}/pkgconfig/pkgmgr-info.pc
 %{_libdir}/libpkgmgr-info.so
 
@@ -103,7 +101,6 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}-parser
 %files parser-devel
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{_includedir}/pkgmgr/pkgmgr_parser.h
-%{_includedir}/pkgmgr/pkgmgr_parser_db.h
+%{_includedir}/pkgmgr/*.h
 %{_libdir}/pkgconfig/pkgmgr-parser.pc
 %{_libdir}/libpkgmgr_parser.so

diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt
index 8aa0381..aaeef28 100644 (file)
--- a/parser/CMakeLists.txt
+++ b/parser/CMakeLists.txt
@@ -61,14 +61,13 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 
 add_definitions("-DSYSCONFDIR=\"${SYSCONFDIR}\"")
 ### Set current binary dir to be included (for generated *.h files)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 ### Build modules
 
-## pkgmgr_parser object (by sewook.park)
 # This library is for installer backend
-add_library(pkgmgr_parser SHARED pkgmgr_parser.c pkgmgr_parser_db.c)
-#add_library(pkgmgr_parser SHARED pkgmgr_parser.c)
+AUX_SOURCE_DIRECTORY(src SRCS)
+add_library(pkgmgr_parser SHARED ${SRCS})
 set_target_properties(pkgmgr_parser PROPERTIES SOVERSION ${VERSION_MAJOR})
 set_target_properties(pkgmgr_parser PROPERTIES VERSION ${VERSION})
 set_target_properties(pkgmgr_parser PROPERTIES COMPILE_FLAGS "${parser_pkgs_CFLAGS_str}")
@@ -80,19 +79,9 @@ configure_file(manifest.xsd.in manifest.xsd @ONLY)
 configure_file(xml.xsd.in xml.xsd @ONLY)
 
 ## Install
-INSTALL(TARGETS
-                       pkgmgr_parser
-               DESTINATION ${LIB_INSTALL_DIR}
-               COMPONENT RuntimeLibraries)
-INSTALL(FILES
-                       pkgmgr_parser.h
-               DESTINATION include/pkgmgr)
-INSTALL(FILES
-                       pkgmgr_parser_db.h
-               DESTINATION include/pkgmgr)
-INSTALL(FILES
-               ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr-parser.pc
-               DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-
+INSTALL(TARGETS pkgmgr_parser DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/pkgmgr
+       PATTERN "*_internal.h" EXCLUDE)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr-parser.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.xsd DESTINATION ${SYSCONFDIR}/package-manager/preload/)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/xml.xsd DESTINATION ${SYSCONFDIR}/package-manager/preload/)

diff --git a/parser/pkgmgr_parser.h b/parser/include/pkgmgr_parser.h
similarity index 100%
rename from parser/pkgmgr_parser.h
rename to parser/include/pkgmgr_parser.h

diff --git a/parser/pkgmgr_parser_db.h b/parser/include/pkgmgr_parser_db.h
similarity index 100%
rename from parser/pkgmgr_parser_db.h
rename to parser/include/pkgmgr_parser_db.h

diff --git a/parser/pkgmgr_parser_internal.h b/parser/include/pkgmgr_parser_internal.h
similarity index 100%
rename from parser/pkgmgr_parser_internal.h
rename to parser/include/pkgmgr_parser_internal.h

diff --git a/parser/pkgmgr_parser.c b/parser/src/pkgmgr_parser.c
similarity index 100%
rename from parser/pkgmgr_parser.c
rename to parser/src/pkgmgr_parser.c

diff --git a/parser/pkgmgr_parser_db.c b/parser/src/pkgmgr_parser_db.c
similarity index 100%
rename from parser/pkgmgr_parser_db.c
rename to parser/src/pkgmgr_parser_db.c