summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFulup Ar Foll <fulup@iot.bzh>2015-12-10 15:32:52 +0100
committerFulup Ar Foll <fulup@iot.bzh>2015-12-10 15:32:52 +0100
commit8b0c4ac0a3d03465c12c2e01c307f319a7f4a361 (patch)
tree3933384d564cae577158bf2c2600f3d3093ae9f6
parent0179cd87a2d7763c07e53b42cbc3b14d993c2dc1 (diff)
Added Netbean to work with cmake
-rw-r--r--.gitignore2
-rw-r--r--Makefile129
-rw-r--r--nbproject/Makefile-Debug.mk126
-rw-r--r--nbproject/Makefile-Release.mk126
-rw-r--r--nbproject/Makefile-impl.mk133
-rw-r--r--nbproject/Makefile-variables.mk35
-rw-r--r--nbproject/Package-Debug.bash76
-rw-r--r--nbproject/Package-Release.bash76
-rw-r--r--nbproject/configurations.xml206
-rw-r--r--nbproject/private/.gitignore (renamed from nbproject/.gitignore)2
-rw-r--r--nbproject/private/CodeAssistancePathMapper.properties1
-rw-r--r--nbproject/private/Default-build.log11
-rw-r--r--nbproject/private/Default-exec.log168
-rw-r--r--nbproject/private/Default.properties1
-rw-r--r--nbproject/private/configurations.xml89
-rw-r--r--nbproject/private/launcher.properties40
-rw-r--r--nbproject/private/private.xml10
-rw-r--r--nbproject/project.xml14
-rw-r--r--src/main.c1
19 files changed, 450 insertions, 796 deletions
diff --git a/.gitignore b/.gitignore
index f42a67c2..3bd40a1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ build/**
dist/**
!.gitignore
.dep.inc
+CMakeFiles/
+CMakeCache.txt
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 180d7a16..00000000
--- a/Makefile
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# There exist several targets which are by default empty and which can be
-# used for execution of your targets. These targets are usually executed
-# before and after some main targets. They are:
-#
-# .build-pre: called before 'build' target
-# .build-post: called after 'build' target
-# .clean-pre: called before 'clean' target
-# .clean-post: called after 'clean' target
-# .clobber-pre: called before 'clobber' target
-# .clobber-post: called after 'clobber' target
-# .all-pre: called before 'all' target
-# .all-post: called after 'all' target
-# .help-pre: called before 'help' target
-# .help-post: called after 'help' target
-#
-# Targets beginning with '.' are not intended to be called on their own.
-#
-# Main targets can be executed directly, and they are:
-#
-# build build a specific configuration
-# clean remove built files from a configuration
-# clobber remove all built files
-# all build all configurations
-# help print help mesage
-#
-# Targets .build-impl, .clean-impl, .clobber-impl, .all-impl, and
-# .help-impl are implemented in nbproject/makefile-impl.mk.
-#
-# Available make variables:
-#
-# CND_BASEDIR base directory for relative paths
-# CND_DISTDIR default top distribution directory (build artifacts)
-# CND_BUILDDIR default top build directory (object files, ...)
-# CONF name of current configuration
-# CND_PLATFORM_${CONF} platform name (current configuration)
-# CND_ARTIFACT_DIR_${CONF} directory of build artifact (current configuration)
-# CND_ARTIFACT_NAME_${CONF} name of build artifact (current configuration)
-# CND_ARTIFACT_PATH_${CONF} path to build artifact (current configuration)
-# CND_PACKAGE_DIR_${CONF} directory of package (current configuration)
-# CND_PACKAGE_NAME_${CONF} name of package (current configuration)
-# CND_PACKAGE_PATH_${CONF} path to package (current configuration)
-#
-# NOCDDL
-CND_BUILDDIR=./build
-CND_DISTDIR=./build/dist
-
-# Environment
-MKDIR=mkdir
-CP=cp
-CCADMIN=CCadmin
-
-
-# build
-build: .build-post
-
-.build-pre:
-# Add your pre 'build' code here...
-
-.build-post: .build-impl
-# Add your post 'build' code here...
-
-
-# clean
-clean: .clean-post
-
-.clean-pre:
-# Add your pre 'clean' code here...
-
-.clean-post: .clean-impl
-# Add your post 'clean' code here...
-
-
-# clobber
-clobber: .clobber-post
-
-.clobber-pre:
-# Add your pre 'clobber' code here...
-
-.clobber-post: .clobber-impl
-# Add your post 'clobber' code here...
-
-
-# all
-all: .all-post
-
-.all-pre:
-# Add your pre 'all' code here...
-
-.all-post: .all-impl
-# Add your post 'all' code here...
-
-
-# build tests
-build-tests: .build-tests-post
-
-.build-tests-pre:
-# Add your pre 'build-tests' code here...
-
-.build-tests-post: .build-tests-impl
-# Add your post 'build-tests' code here...
-
-
-# run tests
-test: .test-post
-
-.test-pre: build-tests
-# Add your pre 'test' code here...
-
-.test-post: .test-impl
-# Add your post 'test' code here...
-
-
-# help
-help: .help-post
-
-.help-pre:
-# Add your pre 'help' code here...
-
-.help-post: .help-impl
-# Add your post 'help' code here...
-
-
-
-# include project implementation makefile
-include nbproject/Makefile-impl.mk
-
-# include project make variables
-include nbproject/Makefile-variables.mk
diff --git a/nbproject/Makefile-Debug.mk b/nbproject/Makefile-Debug.mk
deleted file mode 100644
index 39692f38..00000000
--- a/nbproject/Makefile-Debug.mk
+++ /dev/null
@@ -1,126 +0,0 @@
-#
-# Generated Makefile - do not edit!
-#
-# Edit the Makefile in the project folder instead (../Makefile). Each target
-# has a -pre and a -post target defined where you can add customized code.
-#
-# This makefile implements configuration specific macros and targets.
-
-
-# Environment
-MKDIR=mkdir
-CP=cp
-GREP=grep
-NM=nm
-CCADMIN=CCadmin
-RANLIB=ranlib
-CC=gcc
-CCC=g++
-CXX=g++
-FC=gfortran
-AS=as
-
-# Macros
-CND_PLATFORM=GNU-Linux
-CND_DLIB_EXT=so
-CND_CONF=Debug
-CND_DISTDIR=dist
-CND_BUILDDIR=build
-
-# Include project Makefile
-include Makefile
-
-# Object Directory
-OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
-
-# Object Files
-OBJECTFILES= \
- ${OBJECTDIR}/src/afbs-api.o \
- ${OBJECTDIR}/src/alsa-api.o \
- ${OBJECTDIR}/src/config.o \
- ${OBJECTDIR}/src/dbus-api.o \
- ${OBJECTDIR}/src/http-svc.o \
- ${OBJECTDIR}/src/main.o \
- ${OBJECTDIR}/src/rest-api.o \
- ${OBJECTDIR}/src/session.o
-
-
-# C Compiler Flags
-CFLAGS=
-
-# CC Compiler Flags
-CCFLAGS=
-CXXFLAGS=
-
-# Fortran Compiler Flags
-FFLAGS=
-
-# Assembler Flags
-ASFLAGS=
-
-# Link Libraries and Options
-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}/afb-daemon
-
-${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}/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 -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 -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 -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 -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 -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 -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 -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 -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:
-
-# Clean Targets
-.clean-conf: ${CLEAN_SUBPROJECTS}
- ${RM} -r ${CND_BUILDDIR}/${CND_CONF}
- ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon
-
-# Subprojects
-.clean-subprojects:
-
-# Enable dependency checking
-.dep.inc: .depcheck-impl
-
-include .dep.inc
diff --git a/nbproject/Makefile-Release.mk b/nbproject/Makefile-Release.mk
deleted file mode 100644
index 7cbdfe86..00000000
--- a/nbproject/Makefile-Release.mk
+++ /dev/null
@@ -1,126 +0,0 @@
-#
-# Generated Makefile - do not edit!
-#
-# Edit the Makefile in the project folder instead (../Makefile). Each target
-# has a -pre and a -post target defined where you can add customized code.
-#
-# This makefile implements configuration specific macros and targets.
-
-
-# Environment
-MKDIR=mkdir
-CP=cp
-GREP=grep
-NM=nm
-CCADMIN=CCadmin
-RANLIB=ranlib
-CC=gcc
-CCC=g++
-CXX=g++
-FC=gfortran
-AS=as
-
-# Macros
-CND_PLATFORM=GNU-Linux
-CND_DLIB_EXT=so
-CND_CONF=Release
-CND_DISTDIR=dist
-CND_BUILDDIR=build
-
-# Include project Makefile
-include Makefile
-
-# Object Directory
-OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
-
-# Object Files
-OBJECTFILES= \
- ${OBJECTDIR}/src/afbs-api.o \
- ${OBJECTDIR}/src/alsa-api.o \
- ${OBJECTDIR}/src/config.o \
- ${OBJECTDIR}/src/dbus-api.o \
- ${OBJECTDIR}/src/http-svc.o \
- ${OBJECTDIR}/src/main.o \
- ${OBJECTDIR}/src/rest-api.o \
- ${OBJECTDIR}/src/session.o
-
-
-# C Compiler Flags
-CFLAGS=
-
-# CC Compiler Flags
-CCFLAGS=
-CXXFLAGS=
-
-# Fortran Compiler Flags
-FFLAGS=
-
-# Assembler Flags
-ASFLAGS=
-
-# Link Libraries and Options
-LDLIBSOPTIONS=
-
-# Build Targets
-.build-conf: ${BUILD_SUBPROJECTS}
- "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon
-
-${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}/afb-daemon ${OBJECTFILES} ${LDLIBSOPTIONS}
-
-${OBJECTDIR}/src/afbs-api.o: src/afbs-api.c
- ${MKDIR} -p ${OBJECTDIR}/src
- ${RM} "$@.d"
- $(COMPILE.c) -O2 -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) -O2 -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) -O2 -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) -O2 -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) -O2 -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) -O2 -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) -O2 -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) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/session.o src/session.c
-
-# Subprojects
-.build-subprojects:
-
-# Clean Targets
-.clean-conf: ${CLEAN_SUBPROJECTS}
- ${RM} -r ${CND_BUILDDIR}/${CND_CONF}
- ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/afb-daemon
-
-# Subprojects
-.clean-subprojects:
-
-# Enable dependency checking
-.dep.inc: .depcheck-impl
-
-include .dep.inc
diff --git a/nbproject/Makefile-impl.mk b/nbproject/Makefile-impl.mk
deleted file mode 100644
index a2d5e848..00000000
--- a/nbproject/Makefile-impl.mk
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# Generated Makefile - do not edit!
-#
-# Edit the Makefile in the project folder instead (../Makefile). Each target
-# has a pre- and a post- target defined where you can add customization code.
-#
-# This makefile implements macros and targets common to all configurations.
-#
-# NOCDDL
-
-
-# Building and Cleaning subprojects are done by default, but can be controlled with the SUB
-# macro. If SUB=no, subprojects will not be built or cleaned. The following macro
-# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf
-# and .clean-reqprojects-conf unless SUB has the value 'no'
-SUB_no=NO
-SUBPROJECTS=${SUB_${SUB}}
-BUILD_SUBPROJECTS_=.build-subprojects
-BUILD_SUBPROJECTS_NO=
-BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}}
-CLEAN_SUBPROJECTS_=.clean-subprojects
-CLEAN_SUBPROJECTS_NO=
-CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
-
-
-# Project Name
-PROJECTNAME=afb-daemon
-
-# Active Configuration
-DEFAULTCONF=Debug
-CONF=${DEFAULTCONF}
-
-# All Configurations
-ALLCONFS=Debug Release
-
-
-# build
-.build-impl: .build-pre .validate-impl .depcheck-impl
- @#echo "=> Running $@... Configuration=$(CONF)"
- "${MAKE}" -f nbproject/Makefile-${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .build-conf
-
-
-# clean
-.clean-impl: .clean-pre .validate-impl .depcheck-impl
- @#echo "=> Running $@... Configuration=$(CONF)"
- "${MAKE}" -f nbproject/Makefile-${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .clean-conf
-
-
-# clobber
-.clobber-impl: .clobber-pre .depcheck-impl
- @#echo "=> Running $@..."
- for CONF in ${ALLCONFS}; \
- do \
- "${MAKE}" -f nbproject/Makefile-$${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .clean-conf; \
- done
-
-# all
-.all-impl: .all-pre .depcheck-impl
- @#echo "=> Running $@..."
- for CONF in ${ALLCONFS}; \
- do \
- "${MAKE}" -f nbproject/Makefile-$${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .build-conf; \
- done
-
-# build tests
-.build-tests-impl: .build-impl .build-tests-pre
- @#echo "=> Running $@... Configuration=$(CONF)"
- "${MAKE}" -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-tests-conf
-
-# run tests
-.test-impl: .build-tests-impl .test-pre
- @#echo "=> Running $@... Configuration=$(CONF)"
- "${MAKE}" -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .test-conf
-
-# dependency checking support
-.depcheck-impl:
- @echo "# This code depends on make tool being used" >.dep.inc
- @if [ -n "${MAKE_VERSION}" ]; then \
- echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES} \$${TESTOBJECTFILES}))" >>.dep.inc; \
- echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \
- echo "include \$${DEPFILES}" >>.dep.inc; \
- echo "endif" >>.dep.inc; \
- else \
- echo ".KEEP_STATE:" >>.dep.inc; \
- echo ".KEEP_STATE_FILE:.make.state.\$${CONF}" >>.dep.inc; \
- fi
-
-# configuration validation
-.validate-impl:
- @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
- then \
- echo ""; \
- echo "Error: can not find the makefile for configuration '${CONF}' in project ${PROJECTNAME}"; \
- echo "See 'make help' for details."; \
- echo "Current directory: " `pwd`; \
- echo ""; \
- fi
- @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
- then \
- exit 1; \
- fi
-
-
-# help
-.help-impl: .help-pre
- @echo "This makefile supports the following configurations:"
- @echo " ${ALLCONFS}"
- @echo ""
- @echo "and the following targets:"
- @echo " build (default target)"
- @echo " clean"
- @echo " clobber"
- @echo " all"
- @echo " help"
- @echo ""
- @echo "Makefile Usage:"
- @echo " make [CONF=<CONFIGURATION>] [SUB=no] build"
- @echo " make [CONF=<CONFIGURATION>] [SUB=no] clean"
- @echo " make [SUB=no] clobber"
- @echo " make [SUB=no] all"
- @echo " make help"
- @echo ""
- @echo "Target 'build' will build a specific configuration and, unless 'SUB=no',"
- @echo " also build subprojects."
- @echo "Target 'clean' will clean a specific configuration and, unless 'SUB=no',"
- @echo " also clean subprojects."
- @echo "Target 'clobber' will remove all built files from all configurations and,"
- @echo " unless 'SUB=no', also from subprojects."
- @echo "Target 'all' will will build all configurations and, unless 'SUB=no',"
- @echo " also build subprojects."
- @echo "Target 'help' prints this message."
- @echo ""
-
diff --git a/nbproject/Makefile-variables.mk b/nbproject/Makefile-variables.mk
deleted file mode 100644
index 60514673..00000000
--- a/nbproject/Makefile-variables.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Generated - do not edit!
-#
-# NOCDDL
-#
-CND_BASEDIR=`pwd`
-CND_BUILDDIR=build
-CND_DISTDIR=dist
-# Debug configuration
-CND_PLATFORM_Debug=GNU-Linux
-CND_ARTIFACT_DIR_Debug=dist/Debug/GNU-Linux
-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=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=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=afb-daemon.tar
-CND_PACKAGE_PATH_Release=dist/Release/GNU-Linux/package/afb-daemon.tar
-#
-# include compiler specific variables
-#
-# dmake command
-ROOT:sh = test -f nbproject/private/Makefile-variables.mk || \
- (mkdir -p nbproject/private && touch nbproject/private/Makefile-variables.mk)
-#
-# gmake command
-.PHONY: $(shell test -f nbproject/private/Makefile-variables.mk || (mkdir -p nbproject/private && touch nbproject/private/Makefile-variables.mk))
-#
-include nbproject/private/Makefile-variables.mk
diff --git a/nbproject/Package-Debug.bash b/nbproject/Package-Debug.bash
deleted file mode 100644
index b7d25543..00000000
--- a/nbproject/Package-Debug.bash
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash -x
-
-#
-# Generated - do not edit!
-#
-
-# Macros
-TOP=`pwd`
-CND_PLATFORM=GNU-Linux
-CND_CONF=Debug
-CND_DISTDIR=dist
-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}/afb-daemon
-OUTPUT_BASENAME=afb-daemon
-PACKAGE_TOP_DIR=afb-daemon/
-
-# Functions
-function checkReturnCode
-{
- rc=$?
- if [ $rc != 0 ]
- then
- exit $rc
- fi
-}
-function makeDirectory
-# $1 directory path
-# $2 permission (optional)
-{
- mkdir -p "$1"
- checkReturnCode
- if [ "$2" != "" ]
- then
- chmod $2 "$1"
- checkReturnCode
- fi
-}
-function copyFileToTmpDir
-# $1 from-file path
-# $2 to-file path
-# $3 permission
-{
- cp "$1" "$2"
- checkReturnCode
- if [ "$3" != "" ]
- then
- chmod $3 "$2"
- checkReturnCode
- fi
-}
-
-# Setup
-cd "${TOP}"
-mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
-rm -rf ${NBTMPDIR}
-mkdir -p ${NBTMPDIR}
-
-# Copy files and create directories and links
-cd "${TOP}"
-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/afb-daemon.tar
-cd ${NBTMPDIR}
-tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/afb-daemon.tar *
-checkReturnCode
-
-# Cleanup
-cd "${TOP}"
-rm -rf ${NBTMPDIR}
diff --git a/nbproject/Package-Release.bash b/nbproject/Package-Release.bash
deleted file mode 100644
index 627cc4c8..00000000
--- a/nbproject/Package-Release.bash
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash -x
-
-#
-# Generated - do not edit!
-#
-
-# Macros
-TOP=`pwd`
-CND_PLATFORM=GNU-Linux
-CND_CONF=Release
-CND_DISTDIR=dist
-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}/afb-daemon
-OUTPUT_BASENAME=afb-daemon
-PACKAGE_TOP_DIR=afb-daemon/
-
-# Functions
-function checkReturnCode
-{
- rc=$?
- if [ $rc != 0 ]
- then
- exit $rc
- fi
-}
-function makeDirectory
-# $1 directory path
-# $2 permission (optional)
-{
- mkdir -p "$1"
- checkReturnCode
- if [ "$2" != "" ]
- then
- chmod $2 "$1"
- checkReturnCode
- fi
-}
-function copyFileToTmpDir
-# $1 from-file path
-# $2 to-file path
-# $3 permission
-{
- cp "$1" "$2"
- checkReturnCode
- if [ "$3" != "" ]
- then
- chmod $3 "$2"
- checkReturnCode
- fi
-}
-
-# Setup
-cd "${TOP}"
-mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
-rm -rf ${NBTMPDIR}
-mkdir -p ${NBTMPDIR}
-
-# Copy files and create directories and links
-cd "${TOP}"
-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/afb-daemon.tar
-cd ${NBTMPDIR}
-tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/afb-daemon.tar *
-checkReturnCode
-
-# Cleanup
-cd "${TOP}"
-rm -rf ${NBTMPDIR}
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index ce722f75..511a81e2 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -1,115 +1,151 @@
<?xml version="1.0" encoding="UTF-8"?>
<configurationDescriptor version="97">
<logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
- <logicalFolder name="HeaderFiles"
- displayName="Header Files"
- projectFiles="true">
- </logicalFolder>
- <logicalFolder name="ResourceFiles"
- displayName="Resource Files"
- projectFiles="true">
- </logicalFolder>
- <logicalFolder name="SourceFiles"
- displayName="Source Files"
- projectFiles="true">
- <itemPath>src/afbs-api.c</itemPath>
- <itemPath>src/alsa-api.c</itemPath>
- <itemPath>src/config.c</itemPath>
- <itemPath>src/dbus-api.c</itemPath>
- <itemPath>src/http-svc.c</itemPath>
- <itemPath>src/main.c</itemPath>
- <itemPath>src/rest-api.c</itemPath>
- <itemPath>src/session.c</itemPath>
- </logicalFolder>
- <logicalFolder name="TestFiles"
- displayName="Test Files"
- projectFiles="false"
- kind="TEST_LOGICAL_FOLDER">
- </logicalFolder>
+ <df root="." name="0">
+ <df name="src">
+ <in>afbs-api.c</in>
+ <in>alsa-api.c</in>
+ <in>config.c</in>
+ <in>dbus-api.c</in>
+ <in>http-svc.c</in>
+ <in>main.c</in>
+ <in>rest-api.c</in>
+ <in>session.c</in>
+ </df>
+ </df>
<logicalFolder name="ExternalFiles"
displayName="Important Files"
projectFiles="false"
kind="IMPORTANT_FILES_FOLDER">
- <itemPath>Makefile</itemPath>
+ <itemPath>CMakeLists.txt</itemPath>
+ <itemPath>build/Makefile</itemPath>
+ <itemPath>nbproject/private/launcher.properties</itemPath>
</logicalFolder>
</logicalFolder>
- <projectmakefile>Makefile</projectmakefile>
+ <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>
+ <sourceRootList>
+ <Elem>.</Elem>
+ </sourceRootList>
+ <projectmakefile>build/Makefile</projectmakefile>
<confs>
- <conf name="Debug" type="1">
+ <conf name="Default" type="0">
<toolsSet>
<compilerSet>default</compilerSet>
- <dependencyChecking>true</dependencyChecking>
+ <dependencyChecking>false</dependencyChecking>
<rebuildPropChanged>false</rebuildPropChanged>
</toolsSet>
- <compileType>
- <cTool>
+ <flagsDictionary>
+ <element flagsID="0" commonFlags="-fPIE"/>
+ <element flagsID="1" commonFlags="-mtune=generic -march=x86-64 -fPIE"/>
+ </flagsDictionary>
+ <codeAssistance>
+ </codeAssistance>
+ <makefileType>
+ <makeTool>
+ <buildCommandWorkingDir>build</buildCommandWorkingDir>
+ <buildCommand>${MAKE} -f Makefile</buildCommand>
+ <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
+ <executablePath>build/src/afb-daemon</executablePath>
+ </makeTool>
+ <preBuild>
+ <preBuildCommandWorkingDir>build</preBuildCommandWorkingDir>
+ <preBuildCommand>cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=${IDE_CC} -DCMAKE_CXX_COMPILER=${IDE_CXX} -DCMAKE_C_FLAGS_DEBUG="-g3 -gdwarf-2" -DCMAKE_CXX_FLAGS_DEBUG="-g3 -gdwarf-2" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..</preBuildCommand>
+ </preBuild>
+ </makefileType>
+ <item path="src/afbs-api.c" ex="false" tool="0" flavor2="2">
+ <cTool flags="1">
<incDir>
+ <pElem>src</pElem>
<pElem>/usr/include/json-c</pElem>
<pElem>include</pElem>
- <pElem>/opt/libmagic/include</pElem>
+ <pElem>build/src</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>
- </compileType>
- <item path="src/afbs-api.c" ex="false" tool="0" flavor2="0">
- </item>
- <item path="src/alsa-api.c" ex="false" tool="0" flavor2="0">
- </item>
- <item path="src/config.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="src/dbus-api.c" ex="false" tool="0" flavor2="0">
- </item>
- <item path="src/http-svc.c" ex="false" tool="0" flavor2="0">
- </item>
- <item path="src/main.c" ex="false" tool="0" flavor2="0">
- </item>
- <item path="src/rest-api.c" ex="false" tool="0" flavor2="0">
- </item>
- <item path="src/session.c" ex="false" tool="0" flavor2="0">
- </item>
- </conf>
- <conf name="Release" type="1">
- <toolsSet>
- <compilerSet>default</compilerSet>
- <dependencyChecking>true</dependencyChecking>
- <rebuildPropChanged>false</rebuildPropChanged>
- </toolsSet>
- <compileType>
- <cTool>
- <developmentMode>5</developmentMode>
+ <item path="src/alsa-api.c" ex="false" tool="0" flavor2="2">
+ <cTool flags="1">
+ <incDir>
+ <pElem>src</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>include</pElem>
+ <pElem>build/src</pElem>
+ </incDir>
</cTool>
- <ccTool>
- <developmentMode>5</developmentMode>
- </ccTool>
- <fortranCompilerTool>
- <developmentMode>5</developmentMode>
- </fortranCompilerTool>
- <asmTool>
- <developmentMode>5</developmentMode>
- </asmTool>
- </compileType>
- <item path="src/afbs-api.c" ex="false" tool="0" flavor2="0">
- </item>
- <item path="src/alsa-api.c" ex="false" tool="0" flavor2="0">
</item>
- <item path="src/config.c" ex="false" tool="0" flavor2="0">
+ <item path="src/config.c" ex="false" tool="0" flavor2="2">
+ <cTool flags="1">
+ <incDir>
+ <pElem>src</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>include</pElem>
+ <pElem>build/src</pElem>
+ </incDir>
+ <preprocessorList>
+ <Elem>__PIC__=2</Elem>
+ <Elem>__PIE__=2</Elem>
+ <Elem>__REGISTER_PREFIX__=</Elem>
+ <Elem>__USER_LABEL_PREFIX__=</Elem>
+ <Elem>__pic__=2</Elem>
+ <Elem>__pie__=2</Elem>
+ </preprocessorList>
+ </cTool>
</item>
- <item path="src/dbus-api.c" ex="false" tool="0" flavor2="0">
+ <item path="src/dbus-api.c" ex="false" tool="0" flavor2="2">
+ <cTool flags="1">
+ <incDir>
+ <pElem>src</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>include</pElem>
+ <pElem>build/src</pElem>
+ </incDir>
+ </cTool>
</item>
- <item path="src/http-svc.c" ex="false" tool="0" flavor2="0">
+ <item path="src/http-svc.c" ex="false" tool="0" flavor2="2">
+ <cTool flags="1">
+ <incDir>
+ <pElem>src</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>include</pElem>
+ <pElem>build/src</pElem>
+ </incDir>
+ </cTool>
</item>
- <item path="src/main.c" ex="false" tool="0" flavor2="0">
+ <item path="src/main.c" ex="false" tool="0" flavor2="2">
+ <cTool flags="0">
+ <incDir>
+ <pElem>include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>build/src</pElem>
+ </incDir>
+ </cTool>
</item>
- <item path="src/rest-api.c" ex="false" tool="0" flavor2="0">
+ <item path="src/rest-api.c" ex="false" tool="0" flavor2="2">
+ <cTool flags="1">
+ <incDir>
+ <pElem>src</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>include</pElem>
+ <pElem>build/src</pElem>
+ </incDir>
+ </cTool>
</item>
- <item path="src/session.c" ex="false" tool="0" flavor2="0">
+ <item path="src/session.c" ex="false" tool="0" flavor2="2">
+ <cTool flags="1">
+ <incDir>
+ <pElem>src</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>include</pElem>
+ <pElem>build/src</pElem>
+ </incDir>
+ <preprocessorList>
+ <Elem>__PIC__=2</Elem>
+ <Elem>__PIE__=2</Elem>
+ <Elem>__REGISTER_PREFIX__=</Elem>
+ <Elem>__USER_LABEL_PREFIX__=</Elem>
+ <Elem>__pic__=2</Elem>
+ <Elem>__pie__=2</Elem>
+ </preprocessorList>
+ </cTool>
</item>
</conf>
</confs>
diff --git a/nbproject/.gitignore b/nbproject/private/.gitignore
index 5e7d2734..da2f4b01 100644
--- a/nbproject/.gitignore
+++ b/nbproject/private/.gitignore
@@ -1,4 +1,4 @@
# Ignore everything in this directory
-*
+**
# Except this file
!.gitignore
diff --git a/nbproject/private/CodeAssistancePathMapper.properties b/nbproject/private/CodeAssistancePathMapper.properties
new file mode 100644
index 00000000..7f5ded8f
--- /dev/null
+++ b/nbproject/private/CodeAssistancePathMapper.properties
@@ -0,0 +1 @@
+# Automatic path mapper. CRC = 1
diff --git a/nbproject/private/Default-build.log b/nbproject/private/Default-build.log
new file mode 100644
index 00000000..df500729
--- /dev/null
+++ b/nbproject/private/Default-build.log
@@ -0,0 +1,11 @@
+Scanning dependencies of target afb-daemon
+[ 12%] Building C object src/CMakeFiles/afb-daemon.dir/main.c.o
+[ 25%] Building C object src/CMakeFiles/afb-daemon.dir/config.c.o
+[ 37%] Building C object src/CMakeFiles/afb-daemon.dir/session.c.o
+[ 50%] Building C object src/CMakeFiles/afb-daemon.dir/http-svc.c.o
+[ 62%] Building C object src/CMakeFiles/afb-daemon.dir/afbs-api.c.o
+[ 75%] Building C object src/CMakeFiles/afb-daemon.dir/dbus-api.c.o
+[ 87%] Building C object src/CMakeFiles/afb-daemon.dir/rest-api.c.o
+[100%] Building C object src/CMakeFiles/afb-daemon.dir/alsa-api.c.o
+Linking C executable afb-daemon
+[100%] Built target afb-daemon
diff --git a/nbproject/private/Default-exec.log b/nbproject/private/Default-exec.log
new file mode 100644
index 00000000..ae220060
--- /dev/null
+++ b/nbproject/private/Default-exec.log
@@ -0,0 +1,168 @@
+called: /usr/bin/gcc
+ /home/fulup/Workspace/afb-daemon/build/src
+ /usr/bin/gcc
+ -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
+
+called: /usr/bin/gcc
+ /home/fulup/Workspace/afb-daemon/build/src
+ /usr/bin/gcc
+ -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
+
+called: /usr/bin/gcc
+ /home/fulup/Workspace/afb-daemon/build/src
+ /usr/bin/gcc
+ -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
+
+called: /usr/bin/gcc
+ /home/fulup/Workspace/afb-daemon/build/src
+ /usr/bin/gcc
+ -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
+
+called: /usr/bin/gcc
+ /home/fulup/Workspace/afb-daemon/build/src
+ /usr/bin/gcc
+ -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
+
+called: /usr/bin/gcc
+ /home/fulup/Workspace/afb-daemon/build/src
+ /usr/bin/gcc
+ -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
+
+called: /usr/bin/gcc
+ /home/fulup/Workspace/afb-daemon/build/src
+ /usr/bin/gcc
+ -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
+
+called: /usr/bin/gcc
+ /home/fulup/Workspace/afb-daemon/build/src
+ /usr/bin/gcc
+ -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
+
+called: /usr/bin/gcc
+ /home/fulup/Workspace/afb-daemon/build/src
+ /usr/bin/gcc
+ -g3
+ -gdwarf-2
+ CMakeFiles/afb-daemon.dir/main.c.o
+ CMakeFiles/afb-daemon.dir/config.c.o
+ CMakeFiles/afb-daemon.dir/session.c.o
+ CMakeFiles/afb-daemon.dir/http-svc.c.o
+ CMakeFiles/afb-daemon.dir/afbs-api.c.o
+ CMakeFiles/afb-daemon.dir/dbus-api.c.o
+ CMakeFiles/afb-daemon.dir/rest-api.c.o
+ CMakeFiles/afb-daemon.dir/alsa-api.c.o
+ -o
+ afb-daemon
+ -rdynamic
+ -ljson-c
+ -lmicrohttpd
+ -lmagic
+
+called: /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../x86_64-suse-linux/bin/ld
+ /home/fulup/Workspace/afb-daemon/build/src
+ /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../x86_64-suse-linux/bin/ld
+ --build-id
+ --eh-frame-hdr
+ -m
+ elf_x86_64
+ -export-dynamic
+ -dynamic-linker
+ /lib64/ld-linux-x86-64.so.2
+ -o
+ afb-daemon
+ /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../lib64/crt1.o
+ /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../lib64/crti.o
+ /usr/lib64/gcc/x86_64-suse-linux/4.8/crtbegin.o
+ -L/usr/lib64/gcc/x86_64-suse-linux/4.8
+ -L/usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../lib64
+ -L/lib/../lib64
+ -L/usr/lib/../lib64
+ -L/usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../x86_64-suse-linux/lib
+ -L/usr/lib64/gcc/x86_64-suse-linux/4.8/../../..
+ CMakeFiles/afb-daemon.dir/main.c.o
+ CMakeFiles/afb-daemon.dir/config.c.o
+ CMakeFiles/afb-daemon.dir/session.c.o
+ CMakeFiles/afb-daemon.dir/http-svc.c.o
+ CMakeFiles/afb-daemon.dir/afbs-api.c.o
+ CMakeFiles/afb-daemon.dir/dbus-api.c.o
+ CMakeFiles/afb-daemon.dir/rest-api.c.o
+ CMakeFiles/afb-daemon.dir/alsa-api.c.o
+ -ljson-c
+ -lmicrohttpd
+ -lmagic
+ -lgcc
+ --as-needed
+ -lgcc_s
+ --no-as-needed
+ -lc
+ -lgcc
+ --as-needed
+ -lgcc_s
+ --no-as-needed
+ /usr/lib64/gcc/x86_64-suse-linux/4.8/crtend.o
+ /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../lib64/crtn.o
+
diff --git a/nbproject/private/Default.properties b/nbproject/private/Default.properties
new file mode 100644
index 00000000..6b8095d5
--- /dev/null
+++ b/nbproject/private/Default.properties
@@ -0,0 +1 @@
+/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
diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml
new file mode 100644
index 00000000..24aab80c
--- /dev/null
+++ b/nbproject/private/configurations.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configurationDescriptor version="97">
+ <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
+ <df root="." name="0">
+ <df name="build">
+ <df name="CMakeFiles">
+ <df name="3.0.2">
+ <df name="CompilerIdC">
+ <in>CMakeCCompilerId.c</in>
+ </df>
+ </df>
+ <df name="CMakeTmp">
+ </df>
+ </df>
+ <df name="src">
+ <df name="CMakeFiles">
+ <df name="afb-daemon.dir">
+ </df>
+ </df>
+ </df>
+ </df>
+ <df name="include">
+ <in>local-def.h</in>
+ <in>proto-def.h</in>
+ </df>
+ <df name="src">
+ <in>afbs-api.c</in>
+ <in>alsa-api.c</in>
+ <in>config.c</in>
+ <in>dbus-api.c</in>
+ <in>http-svc.c</in>
+ <in>main.c</in>
+ <in>rest-api.c</in>
+ <in>session.c</in>
+ </df>
+ </df>
+ </logicalFolder>
+ <projectmakefile>build/Makefile</projectmakefile>
+ <confs>
+ <conf name="Default" type="0">
+ <toolsSet>
+ <developmentServer>localhost</developmentServer>
+ <platform>2</platform>
+ </toolsSet>
+ <compile>
+ <compiledirpicklist>
+ <compiledirpicklistitem>.</compiledirpicklistitem>
+ <compiledirpicklistitem>${AUTO_FOLDER}</compiledirpicklistitem>
+ </compiledirpicklist>
+ <compiledir>${AUTO_FOLDER}</compiledir>
+ <compilecommandpicklist>
+ <compilecommandpicklistitem>${MAKE} ${ITEM_NAME}.o</compilecommandpicklistitem>
+ <compilecommandpicklistitem>${AUTO_COMPILE}</compilecommandpicklistitem>
+ </compilecommandpicklist>
+ <compilecommand>${AUTO_COMPILE}</compilecommand>
+ </compile>
+ <dbx_gdbdebugger version="1">
+ <gdb_pathmaps>
+ </gdb_pathmaps>
+ <gdb_interceptlist>
+ <gdbinterceptoptions gdb_all="false" gdb_unhandled="true" gdb_unexpected="true"/>
+ </gdb_interceptlist>
+ <gdb_signals>
+ </gdb_signals>
+ <gdb_options>
+ <DebugOptions>
+ </DebugOptions>
+ </gdb_options>
+ <gdb_buildfirst gdb_buildfirst_overriden="false" gdb_buildfirst_old="false"/>
+ </dbx_gdbdebugger>
+ <nativedebugger version="1">
+ <engine>gdb</engine>
+ </nativedebugger>
+ <runprofile version="9">
+ <runcommandpicklist>
+ <runcommandpicklistitem>"${OUTPUT_PATH}"</runcommandpicklistitem>
+ <runcommandpicklistitem>"${OUTPUT_PATH}" --verbose --alias=icons:/usr/share/icons</runcommandpicklistitem>
+ </runcommandpicklist>
+ <runcommand>"${OUTPUT_PATH}" --verbose --alias=icons:/usr/share/icons</runcommand>
+ <rundir>build</rundir>
+ <buildfirst>true</buildfirst>
+ <terminal-type>0</terminal-type>
+ <remove-instrumentation>0</remove-instrumentation>
+ <environment>
+ </environment>
+ </runprofile>
+ </conf>
+ </confs>
+</configurationDescriptor>
diff --git a/nbproject/private/launcher.properties b/nbproject/private/launcher.properties
new file mode 100644
index 00000000..6cc2127d
--- /dev/null
+++ b/nbproject/private/launcher.properties
@@ -0,0 +1,40 @@
+# Launchers File syntax:
+#
+# [Must-have property line]
+# launcher1.runCommand=<Run Command>
+# [Optional extra properties]
+# launcher1.displayName=<Display Name, runCommand by default>
+# launcher1.buildCommand=<Build Command, Build Command specified in project properties by default>
+# launcher1.runDir=<Run Directory, ${PROJECT_DIR} by default>
+# launcher1.symbolFiles=<Symbol Files loaded by debugger, ${OUTPUT_PATH} by default>
+# launcher1.env.<Environment variable KEY>=<Environment variable VALUE>
+# (If this value is quoted with ` it is handled as a native command which execution result will become the value)
+# [Common launcher properties]
+# common.runDir=<Run Directory>
+# (This value is overwritten by a launcher specific runDir value if the latter exists)
+# common.env.<Environment variable KEY>=<Environment variable VALUE>
+# (Environment variables from common launcher are merged with launcher specific variables)
+# common.symbolFiles=<Symbol Files loaded by debugger>
+# (This value is overwritten by a launcher specific symbolFiles value if the latter exists)
+#
+# In runDir, symbolFiles and env fields you can use these macroses:
+# ${PROJECT_DIR} - project directory absolute path
+# ${OUTPUT_PATH} - linker output path (relative to project directory path)
+# ${OUTPUT_BASENAME}- linker output filename
+# ${TESTDIR} - test files directory (relative to project directory path)
+# ${OBJECTDIR} - object files directory (relative to project directory path)
+# ${CND_DISTDIR} - distribution directory (relative to project directory path)
+# ${CND_BUILDDIR} - build directory (relative to project directory path)
+# ${CND_PLATFORM} - platform name
+# ${CND_CONF} - configuration name
+# ${CND_DLIB_EXT} - dynamic library extension
+#
+# All the project launchers must be listed in the file!
+#
+# launcher1.runCommand=...
+# launcher2.runCommand=...
+# ...
+# common.runDir=...
+# common.env.KEY=VALUE
+
+# launcher1.runCommand=<type your run command here> \ No newline at end of file
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
new file mode 100644
index 00000000..4f3fdc62
--- /dev/null
+++ b/nbproject/private/private.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+ <code-assistance-data xmlns="http://www.netbeans.org/ns/make-project-private/1">
+ <code-model-enabled>true</code-model-enabled>
+ </code-assistance-data>
+ <data xmlns="http://www.netbeans.org/ns/make-project-private/1">
+ <activeConfTypeElem>0</activeConfTypeElem>
+ <activeConfIndexElem>0</activeConfIndexElem>
+ </data>
+</project-private>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 91920333..202336cd 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -6,18 +6,16 @@
<name>afb-daemon</name>
<c-extensions>c</c-extensions>
<cpp-extensions/>
- <header-extensions/>
+ <header-extensions>h</header-extensions>
<sourceEncoding>UTF-8</sourceEncoding>
<make-dep-projects/>
- <sourceRootList/>
+ <sourceRootList>
+ <sourceRootElem>.</sourceRootElem>
+ </sourceRootList>
<confList>
<confElem>
- <name>Debug</name>
- <type>1</type>
- </confElem>
- <confElem>
- <name>Release</name>
- <type>1</type>
+ <name>Default</name>
+ <type>0</type>
</confElem>
</confList>
<formatting>
diff --git a/src/main.c b/src/main.c
index 323b060f..78ffae54 100644
--- a/src/main.c
+++ b/src/main.c
@@ -241,7 +241,6 @@ static void listenLoop (AFB_session *session) {
}
}
-
/*---------------------------------------------------------
| main
| Parse option and launch action