SENSOR service integration

diff --git a/configure.ac b/configure.ac
index 3589bb14582089d5c7c8466054c29b1374e3d49e..8fb6244f4b758351aef9d80cbf831a64119d2a9d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1457,6 +1457,8 @@ src/revocation/Makefile
 src/revocation/revocation.conf
 src/secretsharing/Makefile
 src/secretsharing/secretsharing.conf
+src/sensor/Makefile
+src/sensor/sensor.conf
 src/scalarproduct/Makefile
 src/scalarproduct/scalarproduct.conf
 src/set/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index 9796f037666d2a9084c2497775c95765a0949d5f..c2b4856fbb7b47a9206dee319aa5a4fc540ec7e3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,7 @@ if HAVE_TESTING
  SECRETSHARING = secretsharing
  EXPERIMENTATION = experimentation
  SCALARPRODUCT = scalarproduct
+ SENSOR = sensor
 endif
 
 if HAVE_EXPERIMENTAL
@@ -21,7 +22,8 @@ if HAVE_EXPERIMENTAL
   $(CONSENSUS) \
   $(SECRETSHARING) \
   $(SCALARPRODUCT) \
-  $(EXPERIMENTATION)
+  $(EXPERIMENTATION) \
+  $(SENSOR)
 endif
 
 

diff --git a/src/include/gnunet_sensor_service.h b/src/include/gnunet_sensor_service.h
index 8f5b806f822066462d03e7cc17c21b0d468376a7..e2ac40098d2f1834c52a4825c6c5112be27ff917 100644 (file)
--- a/src/include/gnunet_sensor_service.h
+++ b/src/include/gnunet_sensor_service.h
@@ -26,9 +26,8 @@
 #ifndef GNUNET_SENSOR_SERVICE_H
 #define GNUNET_SENSOR_SERVICE_H
 
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_util_lib.h>
-#include "gnunet_protocols_mi.h"
+#include "platform.h"
+#include "gnunet_util_lib.h"
 
 #ifdef __cplusplus
 extern "C"

diff --git a/src/sensor/Makefile.am b/src/sensor/Makefile.am
index 24479cff9f04c965a93785aa9b779ff952f24fba..eeed7fc8f0100083cf263dbf3ca52f41fd8cb086 100644 (file)
--- a/src/sensor/Makefile.am
+++ b/src/sensor/Makefile.am
@@ -1,69 +1,59 @@
-SUBDIRS = .
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
-INCLUDES = \
-  -I$(top_srcdir)/src/include \
-  -I$(top_srcdir)
+pkgcfgdir= $(pkgdatadir)/config.d/
 
-AM_CPPFLAGS = \
-  $(GNUNET_CPPFLAGS)
+libexecdir= $(pkglibdir)/libexec/
 
-# Set this variable if you are using GNUNET libraries for all programs and
-# libraries. You don't then need to target-specific _LDFLAGS with GNUNET_LDFLAGS
-# AM_LDFLAGS = \
-#   $(GNUNET_LDFLAGS) \
-#   $(WINFLAGS) \
-#   -export-dynamic
+dist_pkgcfg_DATA = \
+  sensor.conf
 
-lib_LTLIBRARIES = libgnunetsensor.la
+if MINGW
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+endif
 
-pkgcfgdir= $(prefix)/share/gnunet/config.d/
+if USE_COVERAGE
+  AM_CFLAGS = -fprofile-arcs -ftest-coverage
+endif
 
-libexecdir= $(prefix)/lib/gnunet/libexec/
+bin_PROGRAMS = \
+ gnunet-sensor 
 
-libgnunetsensor_la_SOURCES = \
-  sensor_api.c 
-libgnunetsensor_la_LIBADD = \
-  -lgnunetutil
-libgnunetsensor_la_LDFLAGS = \
-  $(GNUNET_LDFLAGS)  $(WINFLAGS) \
-  -version-info 0:0:0
-
-
-bin_PROGRAMS = gnunet-sensor
+libexec_PROGRAMS = \
+ gnunet-service-sensor
 
-libexec_PROGRAMS = gnunet-service-sensor
+lib_LTLIBRARIES = \
+ libgnunetsensor.la
 
-check_PROGRAMS = \
- test_sensor_api 
-
-TESTS = $(check_PROGRAMS)
+gnunet_sensor_SOURCES = \
+ gnunet-sensor.c         
+gnunet_sensor_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  libgnunetsensor.la \
+  $(GN_LIBINTL)
 
 gnunet_service_sensor_SOURCES = \
-  gnunet-service-sensor.c
+ gnunet-service-sensor.c         
 gnunet_service_sensor_LDADD = \
-  -lgnunetutil -lgnunetcore -lgnunetdht\
-  $(INTLLIBS) 
-gnunet_service_sensor_LDFLAGS = \
-  $(GNUNET_LDFLAGS)  $(WINFLAGS) -export-dynamic 
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL)
 
-gnunet_sensor_SOURCES = \
-  gnunet-sensor.c
-gnunet_sensor_LDADD = \
-  -lgnunetutil \
-  libgnunetsensor.la \
-  $(INTLLIBS) 
-gnunet_sensor_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic 
+libgnunetsensor_la_SOURCES = \
+  sensor_api.c 
+libgnunetsensor_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la
+libgnunetsensor_la_LDFLAGS = \
+  $(GNUNET_LDFLAGS)
 
+check_PROGRAMS = \
+ test_sensor_api
 
+if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+TESTS = $(check_PROGRAMS)
+endif
 
 test_sensor_api_SOURCES = \
  test_sensor_api.c
 test_sensor_api_LDADD = \
-  $(top_builddir)/src/sensor/libgnunetsensor.la \
-  -lgnunetutil
-test_sensor_api_LDFLAGS = \
- $(GNUNET_LDFLAGS)  $(WINFLAGS) -export-dynamic
- 
- pkgcfg_DATA = sensor.conf 
- 
+  $(top_builddir)/src/util/libgnunetutil.la  
+