From 0608d9d3e98a9ed7a08df21401907b4e3a5e0f67 Mon Sep 17 00:00:00 2001 From: Fulup Ar Foll Date: Thu, 10 Dec 2015 19:06:23 +0100 Subject: Fix &query error --- nbproject/configurations.xml | 104 +++++++++-------------------------- nbproject/private/Default.properties | 7 +++ nbproject/private/configurations.xml | 39 ++++++++++++- nbproject/private/private.xml | 7 ++- nbproject/project.xml | 1 + 5 files changed, 73 insertions(+), 85 deletions(-) (limited to 'nbproject') diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 6d98107c..3d743b11 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -13,6 +13,16 @@ session.c + + + + CMakeLists.txt + build/Makefile + nbproject/private/launcher.properties + ^(nbproject)$ . + . build/Makefile @@ -36,7 +47,6 @@ - @@ -46,6 +56,13 @@ ${MAKE} -f Makefile ${MAKE} -f Makefile clean build/src/afb-daemon + + + include + /usr/include/json-c + build/src + + build @@ -54,106 +71,35 @@ - - - src - /usr/include/json-c - include - build/src - + - - - src - /usr/include/json-c - include - build/src - + - - - src - /usr/include/json-c - include - build/src - - - __PIC__=2 - __PIE__=2 - __REGISTER_PREFIX__= - __USER_LABEL_PREFIX__= - __pic__=2 - __pie__=2 - + - - include - /usr/include/json-c - build/src - - - - src - /usr/include/json-c - include - build/src - + - - - src - /usr/include/json-c - include - build/src - - - __PIC__=2 - __PIE__=2 - __REGISTER_PREFIX__= - __USER_LABEL_PREFIX__= - __pic__=2 - __pie__=2 - + - - - src - /usr/include/json-c - include - build/src - + - - - src - /usr/include/json-c - include - build/src - - - __PIC__=2 - __PIE__=2 - __REGISTER_PREFIX__= - __USER_LABEL_PREFIX__= - __pic__=2 - __pie__=2 - + diff --git a/nbproject/private/Default.properties b/nbproject/private/Default.properties index 6b8095d5..de73bf9e 100644 --- a/nbproject/private/Default.properties +++ b/nbproject/private/Default.properties @@ -1 +1,8 @@ +/home/fulup/Workspace/afb-daemon/src/session.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/session.c.o -c /home/fulup/Workspace/afb-daemon/src/session.c +/home/fulup/Workspace/afb-daemon/src/alsa-api.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/alsa-api.c.o -c /home/fulup/Workspace/afb-daemon/src/alsa-api.c /home/fulup/Workspace/afb-daemon/src/main.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/main.c.o -c /home/fulup/Workspace/afb-daemon/src/main.c +/home/fulup/Workspace/afb-daemon/src/dbus-api.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/dbus-api.c.o -c /home/fulup/Workspace/afb-daemon/src/dbus-api.c +/home/fulup/Workspace/afb-daemon/src/http-svc.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/http-svc.c.o -c /home/fulup/Workspace/afb-daemon/src/http-svc.c +/home/fulup/Workspace/afb-daemon/src/afbs-api.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/afbs-api.c.o -c /home/fulup/Workspace/afb-daemon/src/afbs-api.c +/home/fulup/Workspace/afb-daemon/src/rest-api.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/rest-api.c.o -c /home/fulup/Workspace/afb-daemon/src/rest-api.c +/home/fulup/Workspace/afb-daemon/src/config.c=/home/fulup/Workspace/afb-daemon/build/src#-g3 -gdwarf-2 -fPIE -I/home/fulup/Workspace/afb-daemon/include -I/usr/include/json-c -o CMakeFiles/afb-daemon.dir/config.c.o -c /home/fulup/Workspace/afb-daemon/src/config.c diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml index 24aab80c..457c443c 100644 --- a/nbproject/private/configurations.xml +++ b/nbproject/private/configurations.xml @@ -4,13 +4,14 @@ - + CMakeCCompilerId.c + feature_tests.c @@ -19,6 +20,12 @@ + + + + + + local-def.h proto-def.h @@ -34,6 +41,34 @@ session.c + + + + + + + + + + + + + + + + + + + + + + + + + + + + build/Makefile @@ -60,8 +95,6 @@ - - diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 4f3fdc62..795635d6 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -1,10 +1,11 @@ - - true - 0 0 + + + + diff --git a/nbproject/project.xml b/nbproject/project.xml index 202336cd..b186144c 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -11,6 +11,7 @@ . + . -- cgit 1.2.3-korg