X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=89a181f59a94383f930c06ee6e9736af3113bfdd;hb=abbb4599f0b921c6f434b6bd02bcfb277eecf745;hp=d2789846f07006583686bc6adcc2380d8507eab4;hpb=d0c20134a2c9ecb53045b63cb1e0d6e2aa2b26d2;p=src%2Fapp-framework-binder.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d2789846..89a181f5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,22 +20,18 @@ 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)
-ADD_DEFINITIONS(-DAGL_DEVEL)
 
 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
@@ -44,8 +40,8 @@ ADD_LIBRARY(afb-lib STATIC
 	afb-context.c
 	afb-cred.c
 	afb-debug.c
-	afb-ditf.c
 	afb-evt.c
+	afb-export.c
 	afb-hook.c
 	afb-hreq.c
 	afb-hsrv.c
@@ -53,9 +49,11 @@ 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-svc.c
+	afb-supervision.c
+	afb-trace.c
 	afb-websock.c
 	afb-ws-client.c
 	afb-ws-json1.c
@@ -64,8 +62,10 @@ ADD_LIBRARY(afb-lib STATIC
 	afb-xreq.c
 	jobs.c
 	locale-root.c
+	process-name.c
 	sd-fds.c
 	sig-monitor.c
+	subpath.c
 	verbose.c
 	websock.c
 	wrap-json.c
@@ -82,22 +82,34 @@ TARGET_LINK_LIBRARIES(afb-daemon
 INSTALL(TARGETS afb-daemon
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
+###########################################
+# build and install afb-daemon
+###########################################
+ADD_EXECUTABLE(afs-supervisor afs-supervisor.c afs-discover.c)
+TARGET_LINK_LIBRARIES(afs-supervisor
+	afb-lib
+	${link_libraries}
+)
+INSTALL(TARGETS afs-supervisor
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
 ###########################################
 # 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)
 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
@@ -111,4 +123,3 @@ TARGET_LINK_LIBRARIES(afb-client-demo
 INSTALL(TARGETS afb-client-demo
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-