aboutsummaryrefslogtreecommitdiffstats
path: root/nbproject
diff options
context:
space:
mode:
authorFulup Ar Foll <fulup@iot.bzh>2015-12-09 01:27:23 +0100
committerFulup Ar Foll <fulup@iot.bzh>2015-12-09 01:27:23 +0100
commitb55efc33fb8df8b0518570b2584b6da9abb3221b (patch)
treeef09396c903355a7d61d57e029f13af90f3ffa3e /nbproject
parent6458b6eb67426974e9a3b8eed1f5620f0de0efc5 (diff)
Added POST, Plugin API signal protection, refactor HTML5 rewrite
Diffstat (limited to 'nbproject')
-rw-r--r--nbproject/Makefile-Debug.mk26
-rw-r--r--nbproject/Makefile-Release.mk8
-rw-r--r--nbproject/Makefile-impl.mk2
-rw-r--r--nbproject/Makefile-variables.mk16
-rw-r--r--nbproject/Package-Debug.bash12
-rw-r--r--nbproject/Package-Release.bash12
-rw-r--r--nbproject/configurations.xml2
-rw-r--r--nbproject/project.xml2
8 files changed, 41 insertions, 39 deletions
diff --git a/nbproject/Makefile-Debug.mk b/nbproject/Makefile-Debug.mk
index 1866ff18..39692f38 100644
--- a/nbproject/Makefile-Debug.mk
+++ b/nbproject/Makefile-Debug.mk
@@ -59,55 +59,55 @@ FFLAGS=
ASFLAGS=
# Link Libraries and Options
-LDLIBSOPTIONS=`pkg-config --libs libmicrohttpd` `pkg-config --libs json-c` -lmagic
+LDLIBSOPTIONS=`pkg-config --libs libmicrohttpd` `pkg-config --libs json-c` -lefence -lmagic
# Build Targets
.build-conf: ${BUILD_SUBPROJECTS}
- "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/appframeworkbinder
+ "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/appframeworkbinder: ${OBJECTFILES}
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon: ${OBJECTFILES}
${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
- ${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/appframeworkbinder ${OBJECTFILES} ${LDLIBSOPTIONS}
+ ${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon ${OBJECTFILES} ${LDLIBSOPTIONS}
${OBJECTDIR}/src/afbs-api.o: src/afbs-api.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
- $(COMPILE.c) -g -I/usr/include/json-c -Iinclude `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/afbs-api.o src/afbs-api.c
+ $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/afbs-api.o src/afbs-api.c
${OBJECTDIR}/src/alsa-api.o: src/alsa-api.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
- $(COMPILE.c) -g -I/usr/include/json-c -Iinclude `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/alsa-api.o src/alsa-api.c
+ $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/alsa-api.o src/alsa-api.c
${OBJECTDIR}/src/config.o: src/config.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
- $(COMPILE.c) -g -I/usr/include/json-c -Iinclude `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/config.o src/config.c
+ $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/config.o src/config.c
${OBJECTDIR}/src/dbus-api.o: src/dbus-api.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
- $(COMPILE.c) -g -I/usr/include/json-c -Iinclude `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/dbus-api.o src/dbus-api.c
+ $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/dbus-api.o src/dbus-api.c
${OBJECTDIR}/src/http-svc.o: src/http-svc.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
- $(COMPILE.c) -g -I/usr/include/json-c -Iinclude `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http-svc.o src/http-svc.c
+ $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/http-svc.o src/http-svc.c
${OBJECTDIR}/src/main.o: src/main.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
- $(COMPILE.c) -g -I/usr/include/json-c -Iinclude `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.c
+ $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/main.o src/main.c
${OBJECTDIR}/src/rest-api.o: src/rest-api.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
- $(COMPILE.c) -g -I/usr/include/json-c -Iinclude `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/rest-api.o src/rest-api.c
+ $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/rest-api.o src/rest-api.c
${OBJECTDIR}/src/session.o: src/session.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
- $(COMPILE.c) -g -I/usr/include/json-c -Iinclude `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/session.o src/session.c
+ $(COMPILE.c) -g -I/usr/include/json-c -Iinclude -I/opt/libmagic/include `pkg-config --cflags libmicrohttpd` `pkg-config --cflags json-c` -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/session.o src/session.c
# Subprojects
.build-subprojects:
@@ -115,7 +115,7 @@ ${OBJECTDIR}/src/session.o: src/session.c
# Clean Targets
.clean-conf: ${CLEAN_SUBPROJECTS}
${RM} -r ${CND_BUILDDIR}/${CND_CONF}
- ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/appframeworkbinder
+ ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon
# Subprojects
.clean-subprojects:
diff --git a/nbproject/Makefile-Release.mk b/nbproject/Makefile-Release.mk
index 6df0bda6..7cbdfe86 100644
--- a/nbproject/Makefile-Release.mk
+++ b/nbproject/Makefile-Release.mk
@@ -63,11 +63,11 @@ LDLIBSOPTIONS=
# Build Targets
.build-conf: ${BUILD_SUBPROJECTS}
- "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/appframeworkbinder
+ "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/appframeworkbinder: ${OBJECTFILES}
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon: ${OBJECTFILES}
${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
- ${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/appframeworkbinder ${OBJECTFILES} ${LDLIBSOPTIONS}
+ ${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon ${OBJECTFILES} ${LDLIBSOPTIONS}
${OBJECTDIR}/src/afbs-api.o: src/afbs-api.c
${MKDIR} -p ${OBJECTDIR}/src
@@ -115,7 +115,7 @@ ${OBJECTDIR}/src/session.o: src/session.c
# Clean Targets
.clean-conf: ${CLEAN_SUBPROJECTS}
${RM} -r ${CND_BUILDDIR}/${CND_CONF}
- ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/appframeworkbinder
+ ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon
# Subprojects
.clean-subprojects:
diff --git a/nbproject/Makefile-impl.mk b/nbproject/Makefile-impl.mk
index 185e4af2..a2d5e848 100644
--- a/nbproject/Makefile-impl.mk
+++ b/nbproject/Makefile-impl.mk
@@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
# Project Name
-PROJECTNAME=AppFrameworkBinder
+PROJECTNAME=afb-daemon
# Active Configuration
DEFAULTCONF=Debug
diff --git a/nbproject/Makefile-variables.mk b/nbproject/Makefile-variables.mk
index 4e44a219..60514673 100644
--- a/nbproject/Makefile-variables.mk
+++ b/nbproject/Makefile-variables.mk
@@ -9,19 +9,19 @@ CND_DISTDIR=dist
# Debug configuration
CND_PLATFORM_Debug=GNU-Linux
CND_ARTIFACT_DIR_Debug=dist/Debug/GNU-Linux
-CND_ARTIFACT_NAME_Debug=appframeworkbinder
-CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-Linux/appframeworkbinder
+CND_ARTIFACT_NAME_Debug=afb-daemon
+CND_ARTIFACT_PATH_Debug=dist/Debug/GNU-Linux/afb-daemon
CND_PACKAGE_DIR_Debug=dist/Debug/GNU-Linux/package
-CND_PACKAGE_NAME_Debug=appframeworkbinder.tar
-CND_PACKAGE_PATH_Debug=dist/Debug/GNU-Linux/package/appframeworkbinder.tar
+CND_PACKAGE_NAME_Debug=afb-daemon.tar
+CND_PACKAGE_PATH_Debug=dist/Debug/GNU-Linux/package/afb-daemon.tar
# Release configuration
CND_PLATFORM_Release=GNU-Linux
CND_ARTIFACT_DIR_Release=dist/Release/GNU-Linux
-CND_ARTIFACT_NAME_Release=appframeworkbinder
-CND_ARTIFACT_PATH_Release=dist/Release/GNU-Linux/appframeworkbinder
+CND_ARTIFACT_NAME_Release=afb-daemon
+CND_ARTIFACT_PATH_Release=dist/Release/GNU-Linux/afb-daemon
CND_PACKAGE_DIR_Release=dist/Release/GNU-Linux/package
-CND_PACKAGE_NAME_Release=appframeworkbinder.tar
-CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux/package/appframeworkbinder.tar
+CND_PACKAGE_NAME_Release=afb-daemon.tar
+CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux/package/afb-daemon.tar
#
# include compiler specific variables
#
diff --git a/nbproject/Package-Debug.bash b/nbproject/Package-Debug.bash
index 26359837..b7d25543 100644
--- a/nbproject/Package-Debug.bash
+++ b/nbproject/Package-Debug.bash
@@ -13,9 +13,9 @@ CND_BUILDDIR=build
CND_DLIB_EXT=so
NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/appframeworkbinder
-OUTPUT_BASENAME=appframeworkbinder
-PACKAGE_TOP_DIR=appframeworkbinder/
+OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon
+OUTPUT_BASENAME=afb-daemon
+PACKAGE_TOP_DIR=afb-daemon/
# Functions
function checkReturnCode
@@ -60,15 +60,15 @@ mkdir -p ${NBTMPDIR}
# Copy files and create directories and links
cd "${TOP}"
-makeDirectory "${NBTMPDIR}/appframeworkbinder/bin"
+makeDirectory "${NBTMPDIR}/afb-daemon/bin"
copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
# Generate tar file
cd "${TOP}"
-rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/appframeworkbinder.tar
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/afb-daemon.tar
cd ${NBTMPDIR}
-tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/appframeworkbinder.tar *
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/afb-daemon.tar *
checkReturnCode
# Cleanup
diff --git a/nbproject/Package-Release.bash b/nbproject/Package-Release.bash
index 4ef9af39..627cc4c8 100644
--- a/nbproject/Package-Release.bash
+++ b/nbproject/Package-Release.bash
@@ -13,9 +13,9 @@ CND_BUILDDIR=build
CND_DLIB_EXT=so
NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/appframeworkbinder
-OUTPUT_BASENAME=appframeworkbinder
-PACKAGE_TOP_DIR=appframeworkbinder/
+OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon
+OUTPUT_BASENAME=afb-daemon
+PACKAGE_TOP_DIR=afb-daemon/
# Functions
function checkReturnCode
@@ -60,15 +60,15 @@ mkdir -p ${NBTMPDIR}
# Copy files and create directories and links
cd "${TOP}"
-makeDirectory "${NBTMPDIR}/appframeworkbinder/bin"
+makeDirectory "${NBTMPDIR}/afb-daemon/bin"
copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
# Generate tar file
cd "${TOP}"
-rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/appframeworkbinder.tar
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/afb-daemon.tar
cd ${NBTMPDIR}
-tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/appframeworkbinder.tar *
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/afb-daemon.tar *
checkReturnCode
# Cleanup
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index c0793702..ce722f75 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -46,12 +46,14 @@
<incDir>
<pElem>/usr/include/json-c</pElem>
<pElem>include</pElem>
+ <pElem>/opt/libmagic/include</pElem>
</incDir>
</cTool>
<linkerTool>
<linkerLibItems>
<linkerOptionItem>`pkg-config --libs libmicrohttpd`</linkerOptionItem>
<linkerOptionItem>`pkg-config --libs json-c`</linkerOptionItem>
+ <linkerLibLibItem>efence</linkerLibLibItem>
<linkerLibLibItem>magic</linkerLibLibItem>
</linkerLibItems>
</linkerTool>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 394601fb..91920333 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -3,7 +3,7 @@
<type>org.netbeans.modules.cnd.makeproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/make-project/1">
- <name>AppFrameworkBinder</name>
+ <name>afb-daemon</name>
<c-extensions>c</c-extensions>
<cpp-extensions/>
<header-extensions/>