summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-08-24 15:25:21 +0200
committerChristian Grothoff <christian@grothoff.org>2021-08-24 15:25:21 +0200
commit8d78615d0bf1307807e9e9ab92672a61f17ea4c7 (patch)
tree533443c44e8cfa4b431f942de5f5b7a60724cd8d
parent5bb46d9a3ab568145f594c5a3cfa31ead3df38eb (diff)
-remove pthread dependency, add additional libexec binary to gnunet package
-rw-r--r--contrib/Makefile.inc3
-rw-r--r--debian/gnunet.install1
-rw-r--r--src/setu/Makefile.am11
3 files changed, 6 insertions, 9 deletions
diff --git a/contrib/Makefile.inc b/contrib/Makefile.inc
index c737a07f8..a563ef4a1 100644
--- a/contrib/Makefile.inc
+++ b/contrib/Makefile.inc
@@ -8,7 +8,8 @@ BUILDCOMMON_SHLIB_FILES = \
build-common/sh/lib.sh/existence_python.sh \
build-common/sh/lib.sh/msg.sh \
build-common/sh/lib.sh/progname.sh \
- build-common/sh/lib.sh/version_gnunet.sh
+ build-common/sh/lib.sh/version_gnunet.sh \
+ build-common/LICENSE
BUILDCOMMON_CONF_FILES = \
build-common/conf/.dir-locals.el \
diff --git a/debian/gnunet.install b/debian/gnunet.install
index 7bf5dce83..a19f47cc8 100644
--- a/debian/gnunet.install
+++ b/debian/gnunet.install
@@ -1,5 +1,6 @@
etc/gnunet.conf
usr/bin/
+usr/libexec/gnunet-cmds-helper
usr/lib/*/gnunet/
usr/lib/*/*.so.*
usr/share/man/
diff --git a/src/setu/Makefile.am b/src/setu/Makefile.am
index 6e2865d8c..77d048add 100644
--- a/src/setu/Makefile.am
+++ b/src/setu/Makefile.am
@@ -7,8 +7,6 @@ libexecdir= $(pkglibdir)/libexec/
plugindir = $(libdir)/gnunet
-PTHREAD = -lpthread
-
pkgcfg_DATA = \
setu.conf
@@ -65,8 +63,7 @@ libgnunetsetu_la_SOURCES = \
setu_api.c setu.h
libgnunetsetu_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL) \
- $(PTHREAD)
+ $(LTLIBINTL)
libgnunetsetu_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
@@ -94,8 +91,7 @@ perf_setu_api_SOURCES = \
perf_setu_api_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \
- libgnunetsetu.la \
- $(PTHREAD)
+ libgnunetsetu.la
plugin_LTLIBRARIES = \
@@ -107,8 +103,7 @@ libgnunet_plugin_block_setu_test_la_LIBADD = \
$(top_builddir)/src/block/libgnunetblock.la \
$(top_builddir)/src/block/libgnunetblockgroup.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(LTLIBINTL) \
- $(PTHREAD)
+ $(LTLIBINTL)
libgnunet_plugin_block_setu_test_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)