From cdb65b9fc2116a787cd66546c9f1348d1cc072df Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sat, 6 Feb 2016 18:11:33 +0100
Subject: [PATCH] Ease compilation with the backend for Salt

---
 src/damon-backend.c |  6 +++++-
 src/project.conf    | 15 ++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/damon-backend.c b/src/damon-backend.c
index 3b70aa1..186f870 100644
--- a/src/damon-backend.c
+++ b/src/damon-backend.c
@@ -15,4 +15,8 @@
 
 
 
-#include "damon-backend-app.c"
+#ifdef DAMON_BACKEND_SALT
+# include "damon-backend-salt.c"
+#else
+# include "damon-backend-app.c"
+#endif
diff --git a/src/project.conf b/src/project.conf
index c5bea74..25a5330 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,12 +1,6 @@
 targets=../data/Probe.h,Probe,DaMon
 cflags=-W -Wall -g -O2 -pedantic -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all
 ldflags=-Wl,-pie -Wl,-z,relro -Wl,-z,now
-#for App
-cflags_force=`pkg-config --cflags libApp`
-ldflags_force=`pkg-config --libs libApp`
-#for Salt
-#cflags_force=`pkg-config --cflags libApp jansson`
-#ldflags_force=`pkg-config --libs libApp jansson`
 dist=Makefile,appbroker.sh,damon.h,damon-backend-app.c,damon-backend-salt.c,rrd.h
 
 [../data/Probe.h]
@@ -16,12 +10,19 @@ depends=../data/Probe.interface
 
 [Probe]
 type=binary
+cflags=`pkg-config --cflags libApp`
+ldflags=`pkg-config --libs libApp` -Wl,--export-dynamic
 sources=probe.c
-ldflags=-Wl,--export-dynamic
 install=$(BINDIR)
 
 [DaMon]
 type=binary
+#for App
+cflags=`pkg-config --cflags libApp`
+ldflags=`pkg-config --libs libApp`
+#for Salt
+#cflags_force=-D DAMON_BACKEND_SALT `pkg-config --cflags libApp jansson`
+#ldflags_force=`pkg-config --libs libApp jansson`
 sources=damon.c,damon-backend.c,damon-main.c,rrd.c
 install=$(BINDIR)