diff options
author | Omar Tarabai <tarabai@devegypt.com> | 2014-04-14 13:02:13 +0000 |
---|---|---|
committer | Omar Tarabai <tarabai@devegypt.com> | 2014-04-14 13:02:13 +0000 |
commit | cd82235f77f58bb6fe8ad65e829f55a51a24596f (patch) | |
tree | dc8b2d10ee0a1cb6a6d1f62c0e98df81609badab | |
parent | b56fa794970ac54860a61bbdb7d60c2b517d127a (diff) | |
download | gnunet-cd82235f77f58bb6fe8ad65e829f55a51a24596f.tar.gz gnunet-cd82235f77f58bb6fe8ad65e829f55a51a24596f.zip |
SENSOR service integration
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/include/gnunet_sensor_service.h | 5 | ||||
-rw-r--r-- | src/sensor/Makefile.am | 90 |
4 files changed, 47 insertions, 54 deletions
diff --git a/configure.ac b/configure.ac index 3589bb145..8fb6244f4 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1457,6 +1457,8 @@ src/revocation/Makefile | |||
1457 | src/revocation/revocation.conf | 1457 | src/revocation/revocation.conf |
1458 | src/secretsharing/Makefile | 1458 | src/secretsharing/Makefile |
1459 | src/secretsharing/secretsharing.conf | 1459 | src/secretsharing/secretsharing.conf |
1460 | src/sensor/Makefile | ||
1461 | src/sensor/sensor.conf | ||
1460 | src/scalarproduct/Makefile | 1462 | src/scalarproduct/Makefile |
1461 | src/scalarproduct/scalarproduct.conf | 1463 | src/scalarproduct/scalarproduct.conf |
1462 | src/set/Makefile | 1464 | src/set/Makefile |
diff --git a/src/Makefile.am b/src/Makefile.am index 9796f0376..c2b4856fb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -9,6 +9,7 @@ if HAVE_TESTING | |||
9 | SECRETSHARING = secretsharing | 9 | SECRETSHARING = secretsharing |
10 | EXPERIMENTATION = experimentation | 10 | EXPERIMENTATION = experimentation |
11 | SCALARPRODUCT = scalarproduct | 11 | SCALARPRODUCT = scalarproduct |
12 | SENSOR = sensor | ||
12 | endif | 13 | endif |
13 | 14 | ||
14 | if HAVE_EXPERIMENTAL | 15 | if HAVE_EXPERIMENTAL |
@@ -21,7 +22,8 @@ if HAVE_EXPERIMENTAL | |||
21 | $(CONSENSUS) \ | 22 | $(CONSENSUS) \ |
22 | $(SECRETSHARING) \ | 23 | $(SECRETSHARING) \ |
23 | $(SCALARPRODUCT) \ | 24 | $(SCALARPRODUCT) \ |
24 | $(EXPERIMENTATION) | 25 | $(EXPERIMENTATION) \ |
26 | $(SENSOR) | ||
25 | endif | 27 | endif |
26 | 28 | ||
27 | 29 | ||
diff --git a/src/include/gnunet_sensor_service.h b/src/include/gnunet_sensor_service.h index 8f5b806f8..e2ac40098 100644 --- a/src/include/gnunet_sensor_service.h +++ b/src/include/gnunet_sensor_service.h | |||
@@ -26,9 +26,8 @@ | |||
26 | #ifndef GNUNET_SENSOR_SERVICE_H | 26 | #ifndef GNUNET_SENSOR_SERVICE_H |
27 | #define GNUNET_SENSOR_SERVICE_H | 27 | #define GNUNET_SENSOR_SERVICE_H |
28 | 28 | ||
29 | #include <gnunet/platform.h> | 29 | #include "platform.h" |
30 | #include <gnunet/gnunet_util_lib.h> | 30 | #include "gnunet_util_lib.h" |
31 | #include "gnunet_protocols_mi.h" | ||
32 | 31 | ||
33 | #ifdef __cplusplus | 32 | #ifdef __cplusplus |
34 | extern "C" | 33 | extern "C" |
diff --git a/src/sensor/Makefile.am b/src/sensor/Makefile.am index 24479cff9..eeed7fc8f 100644 --- a/src/sensor/Makefile.am +++ b/src/sensor/Makefile.am | |||
@@ -1,69 +1,59 @@ | |||
1 | SUBDIRS = . | 1 | AM_CPPFLAGS = -I$(top_srcdir)/src/include |
2 | 2 | ||
3 | INCLUDES = \ | 3 | pkgcfgdir= $(pkgdatadir)/config.d/ |
4 | -I$(top_srcdir)/src/include \ | ||
5 | -I$(top_srcdir) | ||
6 | 4 | ||
7 | AM_CPPFLAGS = \ | 5 | libexecdir= $(pkglibdir)/libexec/ |
8 | $(GNUNET_CPPFLAGS) | ||
9 | 6 | ||
10 | # Set this variable if you are using GNUNET libraries for all programs and | 7 | dist_pkgcfg_DATA = \ |
11 | # libraries. You don't then need to target-specific _LDFLAGS with GNUNET_LDFLAGS | 8 | sensor.conf |
12 | # AM_LDFLAGS = \ | ||
13 | # $(GNUNET_LDFLAGS) \ | ||
14 | # $(WINFLAGS) \ | ||
15 | # -export-dynamic | ||
16 | 9 | ||
17 | lib_LTLIBRARIES = libgnunetsensor.la | 10 | if MINGW |
11 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | ||
12 | endif | ||
18 | 13 | ||
19 | pkgcfgdir= $(prefix)/share/gnunet/config.d/ | 14 | if USE_COVERAGE |
15 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | ||
16 | endif | ||
20 | 17 | ||
21 | libexecdir= $(prefix)/lib/gnunet/libexec/ | 18 | bin_PROGRAMS = \ |
19 | gnunet-sensor | ||
22 | 20 | ||
23 | libgnunetsensor_la_SOURCES = \ | 21 | libexec_PROGRAMS = \ |
24 | sensor_api.c | 22 | gnunet-service-sensor |
25 | libgnunetsensor_la_LIBADD = \ | ||
26 | -lgnunetutil | ||
27 | libgnunetsensor_la_LDFLAGS = \ | ||
28 | $(GNUNET_LDFLAGS) $(WINFLAGS) \ | ||
29 | -version-info 0:0:0 | ||
30 | |||
31 | |||
32 | bin_PROGRAMS = gnunet-sensor | ||
33 | 23 | ||
34 | libexec_PROGRAMS = gnunet-service-sensor | 24 | lib_LTLIBRARIES = \ |
25 | libgnunetsensor.la | ||
35 | 26 | ||
36 | check_PROGRAMS = \ | 27 | gnunet_sensor_SOURCES = \ |
37 | test_sensor_api | 28 | gnunet-sensor.c |
38 | 29 | gnunet_sensor_LDADD = \ | |
39 | TESTS = $(check_PROGRAMS) | 30 | $(top_builddir)/src/util/libgnunetutil.la \ |
31 | libgnunetsensor.la \ | ||
32 | $(GN_LIBINTL) | ||
40 | 33 | ||
41 | gnunet_service_sensor_SOURCES = \ | 34 | gnunet_service_sensor_SOURCES = \ |
42 | gnunet-service-sensor.c | 35 | gnunet-service-sensor.c |
43 | gnunet_service_sensor_LDADD = \ | 36 | gnunet_service_sensor_LDADD = \ |
44 | -lgnunetutil -lgnunetcore -lgnunetdht\ | 37 | $(top_builddir)/src/util/libgnunetutil.la \ |
45 | $(INTLLIBS) | 38 | $(GN_LIBINTL) |
46 | gnunet_service_sensor_LDFLAGS = \ | ||
47 | $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic | ||
48 | 39 | ||
49 | gnunet_sensor_SOURCES = \ | 40 | libgnunetsensor_la_SOURCES = \ |
50 | gnunet-sensor.c | 41 | sensor_api.c |
51 | gnunet_sensor_LDADD = \ | 42 | libgnunetsensor_la_LIBADD = \ |
52 | -lgnunetutil \ | 43 | $(top_builddir)/src/util/libgnunetutil.la |
53 | libgnunetsensor.la \ | 44 | libgnunetsensor_la_LDFLAGS = \ |
54 | $(INTLLIBS) | 45 | $(GNUNET_LDFLAGS) |
55 | gnunet_sensor_LDFLAGS = \ | ||
56 | $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic | ||
57 | 46 | ||
47 | check_PROGRAMS = \ | ||
48 | test_sensor_api | ||
58 | 49 | ||
50 | if ENABLE_TEST_RUN | ||
51 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; | ||
52 | TESTS = $(check_PROGRAMS) | ||
53 | endif | ||
59 | 54 | ||
60 | test_sensor_api_SOURCES = \ | 55 | test_sensor_api_SOURCES = \ |
61 | test_sensor_api.c | 56 | test_sensor_api.c |
62 | test_sensor_api_LDADD = \ | 57 | test_sensor_api_LDADD = \ |
63 | $(top_builddir)/src/sensor/libgnunetsensor.la \ | 58 | $(top_builddir)/src/util/libgnunetutil.la |
64 | -lgnunetutil | 59 | |
65 | test_sensor_api_LDFLAGS = \ | ||
66 | $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic | ||
67 | |||
68 | pkgcfg_DATA = sensor.conf | ||
69 | |||