X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=fe40c4c6870ea7b6914a3261350ba8b21d72479c;hb=f57f26b6f498a6209e72547d6cddc7a41f7987b2;hp=0e39dc9416305a2eca9ee058c446914f014f6ed6;hpb=e000e3b73ee0582882324e504fe2dae7386534f8;p=src%2Fapp-framework-binder.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0e39dc94..fe40c4c6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,39 +29,6 @@ ADD_DEFINITIONS(-DBINDING_INSTALL_DIR="${binding_install_dir}")
 # Always add INFER_EXTENSION (more details in afb-hreq.c)
 ADD_DEFINITIONS(-DINFER_EXTENSION)
 
-CHECK_INCLUDE_FILES(magic.h HAVE_MAGIC_H)
-CHECK_LIBRARY_EXISTS(magic magic_load "" HAVE_LIBMAGIC_SO)
-IF(HAVE_MAGIC_H)
-  IF(HAVE_LIBMAGIC_SO)
-    SET(HAVE_LIBMAGIC "1")
-  ENDIF(HAVE_LIBMAGIC_SO)
-ENDIF(HAVE_MAGIC_H)
-
-IF(NOT HAVE_LIBMAGIC)
-  MESSAGE(FATAL_ERROR "\"magic.h\" or \"libmagic.so\" missing.
-    Please install the \"file-devel\" or \"libmagic-dev\" package !")
-ENDIF(NOT HAVE_LIBMAGIC)
-ADD_DEFINITIONS(-DUSE_MAGIC_MIME_TYPE)
-
-PKG_CHECK_MODULES(libsystemd REQUIRED libsystemd>=222)
-PKG_CHECK_MODULES(libmicrohttpd REQUIRED libmicrohttpd>=0.9.54)
-PKG_CHECK_MODULES(openssl REQUIRED openssl)
-PKG_CHECK_MODULES(uuid REQUIRED uuid)
-PKG_CHECK_MODULES(cynara cynara-client)
-
-IF(cynara_FOUND)
-	ADD_DEFINITIONS(-DBACKEND_PERMISSION_IS_CYNARA)
-ENDIF(cynara_FOUND)
-
-INCLUDE_DIRECTORIES(
-	${include_dirs}
-	${libsystemd_INCLUDE_DIRS}
-	${libmicrohttpd_INCLUDE_DIRS}
-	${uuid_INCLUDE_DIRS}
-	${openssl_INCLUDE_DIRS}
-	${cynara_INCLUDE_DIRS}
-)
-
 ADD_LIBRARY(afb-lib STATIC
 	afb-api.c
 	afb-api-dbus.c
@@ -75,6 +42,7 @@ ADD_LIBRARY(afb-lib STATIC
 	afb-config.c
 	afb-context.c
 	afb-cred.c
+	afb-debug.c
 	afb-ditf.c
 	afb-evt.c
 	afb-hook.c
@@ -86,8 +54,8 @@ ADD_LIBRARY(afb-lib STATIC
 	afb-msg-json.c
 	afb-session.c
 	afb-stub-ws.c
-	afb-subcall.c
 	afb-svc.c
+	afb-trace.c
 	afb-websock.c
 	afb-ws-client.c
 	afb-ws-json1.c
@@ -98,8 +66,10 @@ ADD_LIBRARY(afb-lib STATIC
 	locale-root.c
 	sd-fds.c
 	sig-monitor.c
+	subpath.c
 	verbose.c
 	websock.c
+	wrap-json.c
 )
 
 ###########################################
@@ -109,16 +79,7 @@ ADD_EXECUTABLE(afb-daemon main.c)
 TARGET_LINK_LIBRARIES(afb-daemon
 	afb-lib
 	${link_libraries}
-	${libsystemd_LDFLAGS}
-	${libmicrohttpd_LDFLAGS}
-	${uuid_LDFLAGS}
-	${openssl_LDFLAGS}
-	${cynara_LDFLAGS}
-	-lmagic
-	-ldl
-	-lrt
 )
-link_directories( /opt/libmicrohttpd-0.9.54/lib/ )
 INSTALL(TARGETS afb-daemon
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
@@ -131,6 +92,7 @@ SET_TARGET_PROPERTIES(afbwsc PROPERTIES
 	SOVERSION ${LIBAFBWSC_SOVERSION})
 TARGET_LINK_LIBRARIES(afbwsc
 	${libsystemd_LDFLAGS}
+	${json-c_LDFLAGS}
 	-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export-afbwsc.map
 	-Wl,--as-needed
 	-Wl,--gc-sections