[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33063 - in gnunet: . src src/include src/sensor
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33063 - in gnunet: . src src/include src/sensor |
Date: |
Mon, 14 Apr 2014 15:02:13 +0200 |
Author: otarabai
Date: 2014-04-14 15:02:13 +0200 (Mon, 14 Apr 2014)
New Revision: 33063
Modified:
gnunet/configure.ac
gnunet/src/Makefile.am
gnunet/src/include/gnunet_sensor_service.h
gnunet/src/sensor/
gnunet/src/sensor/Makefile.am
Log:
SENSOR service integration
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2014-04-14 12:16:18 UTC (rev 33062)
+++ gnunet/configure.ac 2014-04-14 13:02:13 UTC (rev 33063)
@@ -1457,6 +1457,8 @@
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
Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am 2014-04-14 12:16:18 UTC (rev 33062)
+++ gnunet/src/Makefile.am 2014-04-14 13:02:13 UTC (rev 33063)
@@ -9,6 +9,7 @@
SECRETSHARING = secretsharing
EXPERIMENTATION = experimentation
SCALARPRODUCT = scalarproduct
+ SENSOR = sensor
endif
if HAVE_EXPERIMENTAL
@@ -21,7 +22,8 @@
$(CONSENSUS) \
$(SECRETSHARING) \
$(SCALARPRODUCT) \
- $(EXPERIMENTATION)
+ $(EXPERIMENTATION) \
+ $(SENSOR)
endif
Modified: gnunet/src/include/gnunet_sensor_service.h
===================================================================
--- gnunet/src/include/gnunet_sensor_service.h 2014-04-14 12:16:18 UTC (rev
33062)
+++ gnunet/src/include/gnunet_sensor_service.h 2014-04-14 13:02:13 UTC (rev
33063)
@@ -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"
Index: gnunet/src/sensor
===================================================================
--- gnunet/src/sensor 2014-04-14 12:16:18 UTC (rev 33062)
+++ gnunet/src/sensor 2014-04-14 13:02:13 UTC (rev 33063)
Property changes on: gnunet/src/sensor
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,6 ##
+Makefile.in
+Makefile
+gnunet-sensor
+gnunet-service-sensor
+.deps
+sensor.conf
Modified: gnunet/src/sensor/Makefile.am
===================================================================
--- gnunet/src/sensor/Makefile.am 2014-04-14 12:16:18 UTC (rev 33062)
+++ gnunet/src/sensor/Makefile.am 2014-04-14 13:02:13 UTC (rev 33063)
@@ -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
+libexec_PROGRAMS = \
+ gnunet-service-sensor
+
+lib_LTLIBRARIES = \
+ libgnunetsensor.la
+
+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_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
libgnunetsensor_la_SOURCES = \
sensor_api.c
libgnunetsensor_la_LIBADD = \
- -lgnunetutil
+ $(top_builddir)/src/util/libgnunetutil.la
libgnunetsensor_la_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) \
- -version-info 0:0:0
+ $(GNUNET_LDFLAGS)
-
-bin_PROGRAMS = gnunet-sensor
-
-libexec_PROGRAMS = gnunet-service-sensor
-
check_PROGRAMS = \
- test_sensor_api
+ test_sensor_api
+if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export
PATH=$${GNUNET_PREFIX:address@hidden@}/bin:$$PATH;
TESTS = $(check_PROGRAMS)
+endif
-gnunet_service_sensor_SOURCES = \
- gnunet-service-sensor.c
-gnunet_service_sensor_LDADD = \
- -lgnunetutil -lgnunetcore -lgnunetdht\
- $(INTLLIBS)
-gnunet_service_sensor_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic
-
-gnunet_sensor_SOURCES = \
- gnunet-sensor.c
-gnunet_sensor_LDADD = \
- -lgnunetutil \
- libgnunetsensor.la \
- $(INTLLIBS)
-gnunet_sensor_LDFLAGS = \
- $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic
-
-
-
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
+
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33063 - in gnunet: . src src/include src/sensor,
gnunet <=