[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 03/03: Fix rps build; remove deprecated files; remove testbed f
|
From: |
gnunet |
|
Subject: |
[gnunet] 03/03: Fix rps build; remove deprecated files; remove testbed from build |
|
Date: |
Thu, 05 Oct 2023 10:51:58 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit 5a98e52507f42f1b3a238c54569d95952bb92e55
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Oct 5 10:51:51 2023 +0200
Fix rps build; remove deprecated files; remove testbed from build
---
configure.ac | 1 -
pkgconfig/Makefile.am | 2 -
pkgconfig/gnunetenv.pc.in | 12 ------
po/POTFILES.in | 4 --
src/hello/hello-uri.c | 1 -
src/rps/Makefile.am | 96 +++++++++++++++++++++++------------------------
6 files changed, 47 insertions(+), 69 deletions(-)
diff --git a/configure.ac b/configure.ac
index 23e657d11..f01e3f9ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1325,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
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 8e0a48279..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 \
@@ -49,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 \
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/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.