X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2FCMakeLists.txt;h=d7cde90360fa5d2a8f52d7d7aca16d28116e165e;hb=3e3a29fa49ec494800a4aa866d84fba4eaa8261b;hp=31fcd51993dc26f859120e933f5a201cf2599ae0;hpb=846e952260278225b79de4062fff1f8f2145a544;p=src%2Fapp-framework-binder.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 31fcd519..d7cde903 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,11 +20,6 @@ if (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
     message(FATAL_ERROR "Require at least gcc-4.9")
 endif(CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
 
-INCLUDE(FindPkgConfig)
-
-ADD_SUBDIRECTORY(genskel)
-ADD_SUBDIRECTORY(tests)
-
 ADD_DEFINITIONS(-DBINDING_INSTALL_DIR="${binding_install_dir}")
 # Always add INFER_EXTENSION (more details in afb-hreq.c)
 ADD_DEFINITIONS(-DINFER_EXTENSION)
@@ -32,9 +27,11 @@ ADD_DEFINITIONS(-DINFER_EXTENSION)
 ADD_LIBRARY(afb-lib STATIC
 	afb-api.c
 	afb-api-dbus.c
+	afb-api-dyn.c
 	afb-api-so.c
 	afb-api-so-v1.c
 	afb-api-so-v2.c
+	afb-api-so-vdyn.c
 	afb-api-ws.c
 	afb-apiset.c
 	afb-auth.c
@@ -43,8 +40,9 @@ ADD_LIBRARY(afb-lib STATIC
 	afb-context.c
 	afb-cred.c
 	afb-debug.c
-	afb-ditf.c
 	afb-evt.c
+	afb-export.c
+	afb-fdev.c
 	afb-hook.c
 	afb-hreq.c
 	afb-hsrv.c
@@ -52,22 +50,29 @@ ADD_LIBRARY(afb-lib STATIC
 	afb-method.c
 	afb-monitor.c
 	afb-msg-json.c
+	afb-proto-ws.c
 	afb-session.c
 	afb-stub-ws.c
-	afb-subcall.c
-	afb-svc.c
+	afb-supervision.c
+	afb-systemd.c
+	afb-trace.c
 	afb-websock.c
 	afb-ws-client.c
 	afb-ws-json1.c
 	afb-ws.c
 	afb-wsj1.c
 	afb-xreq.c
+	fdev.c
+	fdev-epoll.c
+	fdev-systemd.c
 	jobs.c
 	locale-root.c
-	sd-fds.c
+	process-name.c
 	sig-monitor.c
+	subpath.c
 	verbose.c
 	websock.c
+	wrap-json.c
 )
 
 ###########################################
@@ -81,22 +86,36 @@ TARGET_LINK_LIBRARIES(afb-daemon
 INSTALL(TARGETS afb-daemon
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
+###########################################
+# build and install afb-daemon
+###########################################
+IF(INCLUDE_SUPERVISOR)
+	ADD_EXECUTABLE(afs-supervisor afs-main.c afs-supervisor.c afs-discover.c afs-config.c)
+	TARGET_LINK_LIBRARIES(afs-supervisor
+		afb-lib
+		${link_libraries}
+	)
+	INSTALL(TARGETS afs-supervisor
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ENDIF()
+
 ###########################################
 # build and install libafbwsc
 ###########################################
-ADD_LIBRARY(afbwsc SHARED afb-ws.c afb-ws-client.c afb-wsj1.c websock.c)
+ADD_LIBRARY(afbwsc SHARED afb-ws.c afb-ws-client.c afb-wsj1.c websock.c afb-proto-ws.c jobs-fake.c fdev.c fdev-systemd.c)
 SET_TARGET_PROPERTIES(afbwsc PROPERTIES
 	VERSION ${LIBAFBWSC_VERSION}
 	SOVERSION ${LIBAFBWSC_SOVERSION})
 TARGET_LINK_LIBRARIES(afbwsc
 	${libsystemd_LDFLAGS}
 	${json-c_LDFLAGS}
+	-lpthread
 	-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export-afbwsc.map
 	-Wl,--as-needed
 	-Wl,--gc-sections
 )
 INSTALL(TARGETS afbwsc LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-INSTALL(FILES afb-wsj1.h afb-ws-client.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/afb)
+INSTALL(FILES afb-wsj1.h afb-ws-client.h afb-proto-ws.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/afb)
 
 ###########################################
 # build and install afb-client-demo
@@ -110,4 +129,3 @@ TARGET_LINK_LIBRARIES(afb-client-demo
 INSTALL(TARGETS afb-client-demo
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-