aboutsummaryrefslogtreecommitdiff
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)
downloadgnunet-8d78615d0bf1307807e9e9ab92672a61f17ea4c7.tar.gz
gnunet-8d78615d0bf1307807e9e9ab92672a61f17ea4c7.zip
-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 = \
8 build-common/sh/lib.sh/existence_python.sh \ 8 build-common/sh/lib.sh/existence_python.sh \
9 build-common/sh/lib.sh/msg.sh \ 9 build-common/sh/lib.sh/msg.sh \
10 build-common/sh/lib.sh/progname.sh \ 10 build-common/sh/lib.sh/progname.sh \
11 build-common/sh/lib.sh/version_gnunet.sh 11 build-common/sh/lib.sh/version_gnunet.sh \
12 build-common/LICENSE
12 13
13BUILDCOMMON_CONF_FILES = \ 14BUILDCOMMON_CONF_FILES = \
14 build-common/conf/.dir-locals.el \ 15 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 @@
1etc/gnunet.conf 1etc/gnunet.conf
2usr/bin/ 2usr/bin/
3usr/libexec/gnunet-cmds-helper
3usr/lib/*/gnunet/ 4usr/lib/*/gnunet/
4usr/lib/*/*.so.* 5usr/lib/*/*.so.*
5usr/share/man/ 6usr/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/
7 7
8plugindir = $(libdir)/gnunet 8plugindir = $(libdir)/gnunet
9 9
10PTHREAD = -lpthread
11
12pkgcfg_DATA = \ 10pkgcfg_DATA = \
13 setu.conf 11 setu.conf
14 12
@@ -65,8 +63,7 @@ libgnunetsetu_la_SOURCES = \
65 setu_api.c setu.h 63 setu_api.c setu.h
66libgnunetsetu_la_LIBADD = \ 64libgnunetsetu_la_LIBADD = \
67 $(top_builddir)/src/util/libgnunetutil.la \ 65 $(top_builddir)/src/util/libgnunetutil.la \
68 $(LTLIBINTL) \ 66 $(LTLIBINTL)
69 $(PTHREAD)
70libgnunetsetu_la_LDFLAGS = \ 67libgnunetsetu_la_LDFLAGS = \
71 $(GN_LIB_LDFLAGS) 68 $(GN_LIB_LDFLAGS)
72 69
@@ -94,8 +91,7 @@ perf_setu_api_SOURCES = \
94perf_setu_api_LDADD = \ 91perf_setu_api_LDADD = \
95 $(top_builddir)/src/util/libgnunetutil.la \ 92 $(top_builddir)/src/util/libgnunetutil.la \
96 $(top_builddir)/src/testing/libgnunettesting.la \ 93 $(top_builddir)/src/testing/libgnunettesting.la \
97 libgnunetsetu.la \ 94 libgnunetsetu.la
98 $(PTHREAD)
99 95
100 96
101plugin_LTLIBRARIES = \ 97plugin_LTLIBRARIES = \
@@ -107,8 +103,7 @@ libgnunet_plugin_block_setu_test_la_LIBADD = \
107 $(top_builddir)/src/block/libgnunetblock.la \ 103 $(top_builddir)/src/block/libgnunetblock.la \
108 $(top_builddir)/src/block/libgnunetblockgroup.la \ 104 $(top_builddir)/src/block/libgnunetblockgroup.la \
109 $(top_builddir)/src/util/libgnunetutil.la \ 105 $(top_builddir)/src/util/libgnunetutil.la \
110 $(LTLIBINTL) \ 106 $(LTLIBINTL)
111 $(PTHREAD)
112libgnunet_plugin_block_setu_test_la_LDFLAGS = \ 107libgnunet_plugin_block_setu_test_la_LDFLAGS = \
113 $(GN_PLUGIN_LDFLAGS) 108 $(GN_PLUGIN_LDFLAGS)
114 109