[gnunet] branch master updated (a03cf810d -> 5a98e5250)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from a03cf810d Fix all warnings that are now also code smells
     new 0760cd6ff Remove deprecated pkgconfig files
     new 1ee4a7f1d Remove testbed from build
     new 5a98e5250 Fix rps build; remove deprecated files; remove testbed from 
build

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac                   |  6 ---
 pkgconfig/Makefile.am          |  4 --
 pkgconfig/gnunetats.pc.in      | 12 ------
 pkgconfig/gnunetenv.pc.in      | 12 ------
 pkgconfig/gnunetpeerinfo.pc.in | 12 ------
 pkgconfig/gnunettestbed.pc.in  | 12 ------
 po/POTFILES.in                 |  4 --
 src/hello/hello-uri.c          |  1 -
 src/rps/Makefile.am            | 96 +++++++++++++++++++++---------------------
 9 files changed, 47 insertions(+), 112 deletions(-)
 delete mode 100644 pkgconfig/gnunetats.pc.in
 delete mode 100644 pkgconfig/gnunetenv.pc.in
 delete mode 100644 pkgconfig/gnunetpeerinfo.pc.in
 delete mode 100644 pkgconfig/gnunettestbed.pc.in

diff --git a/configure.ac b/configure.ac
index 04a366f31..f01e3f9ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1298,10 +1298,6 @@ src/sq/Makefile
 src/statistics/Makefile
 src/statistics/statistics.conf
 src/template/Makefile
-src/testbed/Makefile
-src/testbed/testbed.conf
-src/testbed-logger/Makefile
-src/testbed-logger/testbed-logger.conf
 src/testing/Makefile
 src/topology/Makefile
 src/transport/Makefile
@@ -1329,7 +1325,6 @@ pkgconfig/gnunetdatacache.pc
 pkgconfig/gnunetdatastore.pc
 pkgconfig/gnunetdht.pc
 pkgconfig/gnunetdns.pc
-pkgconfig/gnunetenv.pc
 pkgconfig/gnunetfragmentation.pc
 pkgconfig/gnunetfs.pc
 pkgconfig/gnunetgns.pc
@@ -1349,7 +1344,6 @@ pkgconfig/gnunetscalarproduct.pc
 pkgconfig/gnunetset.pc
 pkgconfig/gnunetspeaker.pc
 pkgconfig/gnunetstatistics.pc
-pkgconfig/gnunettestbed.pc
 pkgconfig/gnunettesting.pc
 pkgconfig/gnunettransport.pc
 pkgconfig/gnunetutil.pc
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 1759ae5fc..77a6b2c78 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -9,7 +9,6 @@ pcfiles = \
        gnunetdatastore.pc \
        gnunetdht.pc \
        gnunetdns.pc \
-       gnunetenv.pc \
        gnunetfragmentation.pc \
        gnunetfs.pc \
        gnunetgns.pc \
@@ -29,7 +28,6 @@ pcfiles = \
        gnunetset.pc \
        gnunetspeaker.pc \
        gnunetstatistics.pc \
-       gnunettestbed.pc \
        gnunettesting.pc \
        gnunettransport.pc \
        gnunetutil.pc \
@@ -50,7 +48,6 @@ EXTRA_DIST = \
        gnunetdatastore.pc.in \
        gnunetdht.pc.in \
        gnunetdns.pc.in \
-       gnunetenv.pc.in \
        gnunetfragmentation.pc.in \
        gnunetfs.pc.in \
        gnunetgns.pc.in \
@@ -71,7 +68,6 @@ EXTRA_DIST = \
        gnunetset.pc.in \
        gnunetspeaker.pc.in \
        gnunetstatistics.pc.in \
-       gnunettestbed.pc.in \
        gnunettesting.pc.in \
        gnunettransport.pc.in \
        gnunetutil.pc.in \
diff --git a/pkgconfig/gnunetats.pc.in b/pkgconfig/gnunetats.pc.in
deleted file mode 100644
index c95469f51..000000000
--- a/pkgconfig/gnunetats.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: GNUnet ATS
-Description: Provides API for allocating bandwidth, expressing preferences for 
certain peers and accessing allocation information
-URL: http://gnunet.org
-Version: @VERSION@
-Requires:
-Libs: -L${libdir} -lgnunetats
-Cflags: -I${includedir}
diff --git a/pkgconfig/gnunetenv.pc.in b/pkgconfig/gnunetenv.pc.in
deleted file mode 100644
index 84e5c7457..000000000
--- a/pkgconfig/gnunetenv.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: GNUnet ENV
-Description: library to manipulate PSYC environments
-URL: https://gnunet.org
-Version: @VERSION@
-Requires:
-Libs: -L${libdir} -lgnunetenv
-Cflags: -I${includedir}
diff --git a/pkgconfig/gnunetpeerinfo.pc.in b/pkgconfig/gnunetpeerinfo.pc.in
deleted file mode 100644
index 226b4f24a..000000000
--- a/pkgconfig/gnunetpeerinfo.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: GNUnet peerinfo
-Description: Provides API to access GNUnet peerinfo service
-URL: http://gnunet.org
-Version: @VERSION@
-Requires:
-Libs: -L${libdir} -lgnunetpeerinfo
-Cflags: -I${includedir}
diff --git a/pkgconfig/gnunettestbed.pc.in b/pkgconfig/gnunettestbed.pc.in
deleted file mode 100644
index cf4fffb46..000000000
--- a/pkgconfig/gnunettestbed.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: GNUnet Testbed
-Description: Provides API for deploying and managing testbeds
-URL: http://gnunet.org
-Version: @VERSION@
-Requires:
-Libs: -L${libdir} -lgnunettestbed
-Cflags: -I${includedir}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e275d112c..6666e4e25 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -532,13 +532,9 @@ src/vpn/gnunet-vpn.c
 src/vpn/vpn_api.c
 src/zonemaster/gnunet-service-zonemaster.c
 src/fs/fs_api.h
-src/include/gnunet_ats_application_service.h
-src/include/gnunet_ats_service.h
-src/include/gnunet_ats_transport_service.h
 src/include/gnunet_json_lib.h
 src/include/gnunet_pq_lib.h
 src/include/gnunet_transport_hello_service.h
-src/include/gnunet_transport_service.h
 src/pq/pq.h
 src/testbed/testbed_api.h
 src/testbed/testbed_api_operations.h
diff --git a/src/hello/hello-uri.c b/src/hello/hello-uri.c
index e885c470d..83d43fa2b 100644
--- a/src/hello/hello-uri.c
+++ b/src/hello/hello-uri.c
@@ -34,7 +34,6 @@
  *   that does this to create bootstrap HELLOs shipped with
  *   the TGZ.
  */
-#include "gnunet_time_lib.h"
 #include "platform.h"
 #include "gnunet_signatures.h"
 #include "gnunet_hello_uri_lib.h"
diff --git a/src/rps/Makefile.am b/src/rps/Makefile.am
index 8f7c104f9..0dddd9726 100644
--- a/src/rps/Makefile.am
+++ b/src/rps/Makefile.am
@@ -45,8 +45,8 @@ libgnunetrps_la_CFLAGS = $(AM_CFLAGS)
 libexec_PROGRAMS = \
  gnunet-service-rps
 
-noinst_PROGRAMS = \
- gnunet-rps-profiler
+#noinst_PROGRAMS = \
+# gnunet-rps-profiler
 
 
 gnunet_service_rps_SOURCES = \
@@ -95,12 +95,12 @@ rps_test_src = \
  rps-sampler_common.h rps-sampler_common.c \
  gnunet-service-rps_sampler.h gnunet-service-rps_sampler.c
 
-ld_rps_test_lib = \
-       libgnunetrps.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  -lm
+#ld_rps_test_lib = \
+#      libgnunetrps.la \
+#  $(top_builddir)/src/util/libgnunetutil.la \
+#  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+#  $(top_builddir)/src/testbed/libgnunettestbed.la \
+#  -lm
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
@@ -124,47 +124,45 @@ test_service_rps_sampler_elem_SOURCES = \
   test_service_rps_sampler_elem.c
 test_service_rps_sampler_elem_LDADD = $(top_builddir)/src/util/libgnunetutil.la
 
-test_rps_single_req_SOURCES = $(rps_test_src)
-test_rps_single_req_LDADD = $(ld_rps_test_lib)
-
-test_rps_seed_request_SOURCES = $(rps_test_src)
-test_rps_seed_request_LDADD = $(ld_rps_test_lib)
-
-test_rps_req_cancel_SOURCES = $(rps_test_src)
-test_rps_req_cancel_LDADD = $(ld_rps_test_lib)
-
-test_rps_sub_SOURCES = $(rps_test_src)
-test_rps_sub_LDADD = $(ld_rps_test_lib)
-
-test_rps_seed_big_SOURCES = $(rps_test_src)
-test_rps_seed_big_LDADD = $(ld_rps_test_lib)
-
-test_rps_churn_SOURCES = $(rps_test_src)
-test_rps_churn_LDADD = $(ld_rps_test_lib)
-
-test_rps_malicious_1_SOURCES = $(rps_test_src)
-test_rps_malicious_1_LDADD = $(ld_rps_test_lib)
-
-test_rps_malicious_2_SOURCES = $(rps_test_src)
-test_rps_malicious_2_LDADD = $(ld_rps_test_lib)
-
-test_rps_malicious_3_SOURCES = $(rps_test_src)
-test_rps_malicious_3_LDADD = $(ld_rps_test_lib)
-
-gnunet_rps_profiler_SOURCES = \
- gnunet-service-rps_sampler_elem.h gnunet-service-rps_sampler_elem.c \
- rps-sampler_common.h rps-sampler_common.c \
- gnunet-service-rps_sampler.h gnunet-service-rps_sampler.c \
- rps-test_util.h rps-test_util.c \
- gnunet-rps-profiler.c
-
-
-gnunet_rps_profiler_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  libgnunetrps.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  -lm
+#test_rps_single_req_SOURCES = $(rps_test_src)
+#test_rps_single_req_LDADD = $(ld_rps_test_lib)
+#
+#test_rps_seed_request_SOURCES = $(rps_test_src)
+#test_rps_seed_request_LDADD = $(ld_rps_test_lib)
+#
+#test_rps_req_cancel_SOURCES = $(rps_test_src)
+#test_rps_req_cancel_LDADD = $(ld_rps_test_lib)
+#
+#test_rps_sub_SOURCES = $(rps_test_src)
+#test_rps_sub_LDADD = $(ld_rps_test_lib)
+#
+#test_rps_seed_big_SOURCES = $(rps_test_src)
+#test_rps_seed_big_LDADD = $(ld_rps_test_lib)
+#
+#test_rps_churn_SOURCES = $(rps_test_src)
+#test_rps_churn_LDADD = $(ld_rps_test_lib)
+#
+#test_rps_malicious_1_SOURCES = $(rps_test_src)
+#test_rps_malicious_1_LDADD = $(ld_rps_test_lib)
+#
+#test_rps_malicious_2_SOURCES = $(rps_test_src)
+#test_rps_malicious_2_LDADD = $(ld_rps_test_lib)
+#
+#test_rps_malicious_3_SOURCES = $(rps_test_src)
+#test_rps_malicious_3_LDADD = $(ld_rps_test_lib)
+
+#gnunet_rps_profiler_SOURCES = \
+# gnunet-service-rps_sampler_elem.h gnunet-service-rps_sampler_elem.c \
+# rps-sampler_common.h rps-sampler_common.c \
+# gnunet-service-rps_sampler.h gnunet-service-rps_sampler.c \
+# rps-test_util.h rps-test_util.c \
+# gnunet-rps-profiler.c
+#gnunet_rps_profiler_LDADD = \
+#  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+#  libgnunetrps.la \
+#  $(top_builddir)/src/util/libgnunetutil.la \
+#  $(top_builddir)/src/testbed/libgnunettestbed.la \
+#  -lm
 
 
 EXTRA_DIST = \

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.