diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-09-22 20:32:39 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-09-22 20:32:39 +0200 |
commit | 369f0a0e879017b0656cd42abd95f4ac58720789 (patch) | |
tree | 6aa32236a5d68bc9a258916671adc88174fda8ab /contrib | |
parent | 81d9255872ce90c057b01ef2a15a9aa9b27c4fe1 (diff) | |
download | gnunet-369f0a0e879017b0656cd42abd95f4ac58720789.tar.gz gnunet-369f0a0e879017b0656cd42abd95f4ac58720789.zip |
The differences between the contrib subdirectory in the git repository and the contrib subdirectory generated by make dist have grown really big. Please find attached another patch for updating the content of:
contrib/Makefile.am
contrib/scripts/Makefile.am
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/Makefile.am | 273 | ||||
-rw-r--r-- | contrib/scripts/Makefile.am | 64 |
2 files changed, 265 insertions, 72 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 150e47ff0..6598c1520 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am | |||
@@ -6,69 +6,239 @@ SUBDIRS = scripts hellos services | |||
6 | include Makefile.inc | 6 | include Makefile.inc |
7 | 7 | ||
8 | dist_pkgdata_DATA = \ | 8 | dist_pkgdata_DATA = \ |
9 | gns/gns-bcd.html \ | 9 | gns/gns-form.xslt \ |
10 | gns/gns-bcd.tex \ | 10 | gns/gns-bcd.html \ |
11 | gns/def.tex \ | 11 | gns/def.tex \ |
12 | gns/gns-form-fields.xml \ | 12 | gns/bootstrap.min.css \ |
13 | gns/gns-form.xslt \ | 13 | gns/gns-form-fields.xml \ |
14 | fcfsd/fcfsd-index.html \ | 14 | gns/gns-bcd.tex \ |
15 | fcfsd/fcfsd-notfound.html \ | 15 | fcfsd/fcfsd-index.html \ |
16 | fcfsd/fcfsd-forbidden.html \ | 16 | fcfsd/fcfsd-forbidden.html \ |
17 | branding/logo/gnunet-logo.pdf \ | 17 | fcfsd/fcfsd-notfound.html \ |
18 | branding/logo/gnunet-logo.png \ | 18 | branding/logo/gnunet-logo.png \ |
19 | branding/logo/gnunet-logo-color.png \ | 19 | branding/logo/lynXified-amirouche-v3.svg \ |
20 | testing_hostkeys.ecc \ | 20 | branding/logo/gnunet-logo-dark-text.svg \ |
21 | $(BUILDCOMMON_SHLIB_FILES) | 21 | branding/logo/gnunet-logo-color.png \ |
22 | branding/logo/lynXified-amirouche-anonymous-v3.png \ | ||
23 | branding/logo/gnunet-logo-dark-only-text.svg \ | ||
24 | branding/logo/gnunet-logo-big.png \ | ||
25 | branding/logo/gnunet-logo.pdf \ | ||
26 | testing_hostkeys.ecc \ | ||
27 | $(BUILDCOMMON_SHLIB_FILES) | ||
22 | 28 | ||
23 | INITD_FILES = \ | 29 | INITD_FILES = \ |
24 | services/openrc/gnunet.initd \ | 30 | services/systemd/gnunet-user.service \ |
25 | services/systemd/gnunet.service | 31 | services/systemd/sysusers-gnunet.conf \ |
32 | services/systemd/gnunet.service \ | ||
33 | services/systemd/tmpfiles-gnunet.conf \ | ||
34 | services/openrc/gnunet.initd | ||
26 | 35 | ||
27 | PACKAGES_FILES = \ | 36 | PACKAGES_FILES = \ |
28 | packages/guix/guix-env-py2.scm \ | 37 | packages/guix/guix-env-py2.scm \ |
29 | packages/guix/guix-env-gillmann.scm \ | 38 | packages/guix/guix-env-gillmann.scm \ |
30 | packages/guix/notest-guix-env.scm \ | 39 | packages/guix/notest-guix-env.scm \ |
31 | packages/homebrew/gnunet.rb \ | 40 | packages/alpine/gnunet-gtk/APKBUILD \ |
32 | packages/nix/gnunet-dev.nix \ | 41 | packages/alpine/gnurl/APKBUILD \ |
33 | packages/nix/default.nix \ | 42 | packages/alpine/gnunet/gnunet-user-services.initd \ |
34 | packages/alpine/gnunet-gtk/APKBUILD \ | 43 | packages/alpine/gnunet/gnunet.pre-deinstall \ |
35 | packages/alpine/gnunet/APKBUILD \ | 44 | packages/alpine/gnunet/gnunet-user.conf \ |
36 | packages/alpine/gnunet/gnunet-system-services.initd \ | 45 | packages/alpine/gnunet/gnunet.xsession \ |
37 | packages/alpine/gnunet/gnunet-system.conf \ | 46 | packages/alpine/gnunet/gnunet-system.conf \ |
38 | packages/alpine/gnunet/gnunet-user-services.initd \ | 47 | packages/alpine/gnunet/APKBUILD \ |
39 | packages/alpine/gnunet/gnunet-user.conf \ | 48 | packages/alpine/gnunet/gnunet.post-install \ |
40 | packages/alpine/gnunet/gnunet.post-install \ | 49 | packages/alpine/gnunet/gnunet.pre-install \ |
41 | packages/alpine/gnunet/gnunet.pre-deinstall \ | 50 | packages/alpine/gnunet/gnunet-system-services.initd \ |
42 | packages/alpine/gnunet/gnunet.pre-install \ | 51 | packages/alpine/gnunet/gnunet-gns-proxy.initd \ |
43 | packages/alpine/gnunet/gnunet.xsession \ | 52 | packages/nix/gnunet-dev.nix \ |
44 | packages/alpine/gnurl/APKBUILD | 53 | packages/nix/default.nix \ |
54 | packages/homebrew/gnunet.rb | ||
45 | 55 | ||
46 | EXTRA_DIST = \ | 56 | EXTRA_DIST = \ |
47 | conf/colorit/colorit.conf \ | 57 | sounds/vonlynX-bdbAm-lo.wav \ |
48 | conf/.style.yapf \ | 58 | sounds/vonlynX-bdbG9-lo.wav \ |
49 | conf/editors/eclipse/gnunet_codingstyle.xml \ | 59 | sounds/vonlynX-ringtones.txt \ |
50 | conf/gnunet/no_forcestart.conf \ | 60 | A-Z.ecc \ |
51 | conf/gnunet/no_autostart_above_core.conf \ | 61 | xdg-scheme-handler/gnunet-uri.desktop \ |
52 | conf/gnunet/gnunet-system.conf \ | 62 | xdg-scheme-handler/README.md \ |
53 | conf/gnunet/gnunet-user.conf \ | 63 | apparmor/gnunet-daemon-testbed-blacklist \ |
54 | conf/nss/nssswitch.conf \ | 64 | apparmor/gnunet-service-identity \ |
55 | conf/wireshark/wireshark.lua \ | 65 | apparmor/gnunet-cadet \ |
56 | gnunet.m4 \ | 66 | apparmor/gnunet-service-core \ |
57 | $(PACKAGES_FILES) \ | 67 | apparmor/gnunet-identity \ |
58 | $(INITD_FILES) \ | 68 | apparmor/gnunet-service-cadet \ |
59 | Makefile.inc \ | 69 | apparmor/gnunet-service-dns \ |
60 | $(BUILD_COMMON_FILES) | 70 | apparmor/gnunet-template \ |
71 | apparmor/gnunet-service-peerstore \ | ||
72 | apparmor/gnunet-nse \ | ||
73 | apparmor/gnunet-helper-transport-wlan \ | ||
74 | apparmor/gnunet-service-set \ | ||
75 | apparmor/gnunet-uri \ | ||
76 | apparmor/gnunet-conversation \ | ||
77 | apparmor/usr.bin.gnunet-helper-nat-server \ | ||
78 | apparmor/gnunet-transport \ | ||
79 | apparmor/gnunet-service-nse \ | ||
80 | apparmor/gnunet-transport-certificate-creation \ | ||
81 | apparmor/gnunet-daemon-hostlist \ | ||
82 | apparmor/gnunet-unindex \ | ||
83 | apparmor/gnunet-nat-server \ | ||
84 | apparmor/gnunet-setup \ | ||
85 | apparmor/gnunet-service-testbed \ | ||
86 | apparmor/gnunet-gtk \ | ||
87 | apparmor/gnunet-scalarproduct \ | ||
88 | apparmor/gnunet-statistics \ | ||
89 | apparmor/gnunet-helper-testbed \ | ||
90 | apparmor/gnunet-scrypt \ | ||
91 | apparmor/gnunet-conversation-test \ | ||
92 | apparmor/gnunet-publish \ | ||
93 | apparmor/gnunet-helper-audio-playback \ | ||
94 | apparmor/gnunet-revocation \ | ||
95 | apparmor/gnunet-helper-vpn \ | ||
96 | apparmor/gnunet-auto-share \ | ||
97 | apparmor/gnunet-service-scalarproduct-alice \ | ||
98 | apparmor/gnunet-service-template \ | ||
99 | apparmor/gnunet-arm \ | ||
100 | apparmor/gnunet-search \ | ||
101 | apparmor/gnunet-ecc \ | ||
102 | apparmor/gnunet-download-manager.scm \ | ||
103 | apparmor/gnunet-service-revocation \ | ||
104 | apparmor/gnunet-gns-proxy-setup-ca \ | ||
105 | apparmor/gnunet-service-mesh \ | ||
106 | apparmor/gnunet-helper-transport-wlan-dummy \ | ||
107 | apparmor/gnunet-service-conversation \ | ||
108 | apparmor/gnunet-fs \ | ||
109 | apparmor/gnunet-statistics-gtk \ | ||
110 | apparmor/gnunet-service-regex \ | ||
111 | apparmor/gnunet-helper-transport-bluetooth \ | ||
112 | apparmor/gnunet-service-resolver \ | ||
113 | apparmor/gnunet-service-fs \ | ||
114 | apparmor/gnunet-helper-nat-client \ | ||
115 | apparmor/gnunet-service-arm \ | ||
116 | apparmor/gnunet-peerinfo-gtk \ | ||
117 | apparmor/gnunet-vpn \ | ||
118 | apparmor/gnunet-helper-exit \ | ||
119 | apparmor/gnunet-set-profiler \ | ||
120 | apparmor/gnunet-helper-fs-publish \ | ||
121 | apparmor/gnunet-service-gns \ | ||
122 | apparmor/gnunet-service-datastore \ | ||
123 | apparmor/gnunet-service-namestore \ | ||
124 | apparmor/gnunet-service-dht \ | ||
125 | apparmor/gnunet-config \ | ||
126 | apparmor/gnunet-testbed-profiler \ | ||
127 | apparmor/gnunet-daemon-pt \ | ||
128 | apparmor/gnunet-peerinfo \ | ||
129 | apparmor/gnunet-service-ats \ | ||
130 | apparmor/gnunet-helper-audio-record \ | ||
131 | apparmor/gnunet-directory \ | ||
132 | apparmor/gnunet-download \ | ||
133 | apparmor/gnunet-fs-gtk \ | ||
134 | apparmor/tunables/gnunet \ | ||
135 | apparmor/gnunet-ats \ | ||
136 | apparmor/gnunet-set-ibf-profiler \ | ||
137 | apparmor/gnunet-dns2gns \ | ||
138 | apparmor/gnunet-service-peerinfo \ | ||
139 | apparmor/gnunet-service-namecache \ | ||
140 | apparmor/gnunet-daemon-exit \ | ||
141 | apparmor/gnunet-resolver \ | ||
142 | apparmor/gnunet-bcd \ | ||
143 | apparmor/gnunet-daemon-regexprofiler \ | ||
144 | apparmor/gnunet-namestore \ | ||
145 | apparmor/gnunet-namestore-gtk \ | ||
146 | apparmor/gnunet-service-testbed-logger \ | ||
147 | apparmor/gnunet-peerstore \ | ||
148 | apparmor/gnunet-namestore-fcfsd \ | ||
149 | apparmor/gnunet-core \ | ||
150 | apparmor/gnunet-gns-import.sh \ | ||
151 | apparmor/gnunet-gns-proxy \ | ||
152 | apparmor/gnunet-identity-gtk \ | ||
153 | apparmor/gnunet-service-vpn \ | ||
154 | apparmor/gnunet-daemon-testbed-underlay \ | ||
155 | apparmor/gnunet-qr \ | ||
156 | apparmor/gnunet-datastore \ | ||
157 | apparmor/gnunet-service-statistics \ | ||
158 | apparmor/gnunet-conversation-gtk \ | ||
159 | apparmor/gnunet-daemon-latency-logger \ | ||
160 | apparmor/gnunet-testing \ | ||
161 | apparmor/gnunet-namecache \ | ||
162 | apparmor/gnunet-service-transport \ | ||
163 | apparmor/gnunet-daemon-topology \ | ||
164 | apparmor/gnunet-helper-dns \ | ||
165 | apparmor/gnunet-gns \ | ||
166 | apparmor/gnunet-helper-nat-server \ | ||
167 | apparmor/abstractions/gnunet-test \ | ||
168 | apparmor/abstractions/gnunet-db \ | ||
169 | apparmor/abstractions/gnunet-gtk \ | ||
170 | apparmor/abstractions/gnunet-common \ | ||
171 | apparmor/abstractions/gnunet-suid \ | ||
172 | apparmor/abstractions/gnunet-sgid \ | ||
173 | apparmor/gnunet-service-scalarproduct-bob \ | ||
174 | conf/uncrustify.cfg \ | ||
175 | conf/tox.ini \ | ||
176 | conf/wireshark/wireshark.lua \ | ||
177 | conf/.style.yapf \ | ||
178 | conf/editors/eclipse/gnunet_codingstyle.xml \ | ||
179 | conf/editors/clang-format \ | ||
180 | conf/uncrustify_precommit \ | ||
181 | conf/gnunet/gnunet-user.conf \ | ||
182 | conf/gnunet/no_autostart_above_core.conf \ | ||
183 | conf/gnunet/gnunet-system.conf \ | ||
184 | conf/gnunet/no_forcestart.conf \ | ||
185 | conf/colorit/colorit.conf \ | ||
186 | conf/nss/nssswitch.conf \ | ||
187 | testbed_infiniband_results/6000_connections_20000_peers.txt \ | ||
188 | testbed_infiniband_results/6000_connections_10000_peers_20_poc.txt \ | ||
189 | testbed_infiniband_results/6000_connections_10000_peers_30_poc.txt \ | ||
190 | testbed_infiniband_results/6000_connections_40000_peers.txt \ | ||
191 | testbed_infiniband_results/6000_connections_60000_peers_5_poc.txt \ | ||
192 | testbed_infiniband_results/30000_connections_90000_peers_30_poc.txt \ | ||
193 | testbed_infiniband_results/6000_connections_80000_peers_20_poc.txt \ | ||
194 | testbed_infiniband_results/6000_connections_80000_peers_5_poc.txt \ | ||
195 | testbed_infiniband_results/6000_connections_10000_peers_100_poc.txt \ | ||
196 | testbed_infiniband_results/6000_connections_60000_peers.txt \ | ||
197 | testbed_configs/testbed_cluster.conf \ | ||
198 | testbed_configs/testbed_infiniband.conf \ | ||
199 | testbed_configs/regex_profiler_infiniband.conf \ | ||
200 | testbed_configs/testbed_supermuc.conf \ | ||
201 | guix.README \ | ||
202 | web/log.php \ | ||
203 | ci/docker/docker-entrypoint.sh \ | ||
204 | ci/docker/Dockerfile \ | ||
205 | ci/buildbot/buildbot-update.sh \ | ||
206 | ci/buildbot/ssh-keys \ | ||
207 | ci/buildbot/ssh-config \ | ||
208 | docker/docker-entrypoint.sh \ | ||
209 | docker/Dockerfile \ | ||
210 | docker/README.md \ | ||
211 | docker/gnunet.conf \ | ||
212 | nse/experiments/infiniband.conf \ | ||
213 | benchmark/collect.awk \ | ||
214 | gnunet_infrastructure/handbook_pull.sh \ | ||
215 | guix.scm \ | ||
216 | indent_pre-commit \ | ||
217 | Makefile.inc \ | ||
218 | gnunet.m4 \ | ||
219 | vagrant/Vagrantfile \ | ||
220 | vagrant/bootstrap.ubuntu.sh \ | ||
221 | privacy-sensitive-symbols.mspec \ | ||
222 | gnunet-arch-full.svg \ | ||
223 | patches/texi2html5-indent.diff \ | ||
224 | patches/transport_ats_years.diff \ | ||
225 | patches/lrn-indent.diff \ | ||
226 | test_gnunet_prefix.c \ | ||
227 | $(PACKAGES_FILES) \ | ||
228 | $(INITD_FILES) \ | ||
229 | $(BUILD_COMMON_FILES) | ||
61 | 230 | ||
62 | check_PROGRAMS = \ | 231 | check_PROGRAMS = \ |
63 | test_gnunet_prefix | 232 | test_gnunet_prefix |
64 | 233 | ||
65 | if ENABLE_TEST_RUN | 234 | if ENABLE_TEST_RUN |
66 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 235 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
67 | TESTS = $(check_PROGRAMS) | 236 | TESTS = \ |
237 | $(check_PROGRAMS) | ||
68 | endif | 238 | endif |
69 | 239 | ||
70 | test_gnunet_prefix_SOURCES = \ | 240 | test_gnunet_prefix_SOURCES = \ |
71 | test_gnunet_prefix.c | 241 | test_gnunet_prefix.c |
72 | 242 | ||
73 | test_gnunet_prefix_CPPFLAGS = \ | 243 | test_gnunet_prefix_CPPFLAGS = \ |
74 | $(LTDLINCL) $(AM_CPPFLAGS) | 244 | $(LTDLINCL) $(AM_CPPFLAGS) |
@@ -80,4 +250,7 @@ test_gnunet_prefix_LDADD = \ | |||
80 | $(LIBLTDL) -lunistring $(XLIB) | 250 | $(LIBLTDL) -lunistring $(XLIB) |
81 | 251 | ||
82 | aclocaldir = $(datadir)/aclocal | 252 | aclocaldir = $(datadir)/aclocal |
83 | aclocal_DATA = gnunet.m4 | 253 | aclocal_DATA = \ |
254 | gnunet.m4 | ||
255 | |||
256 | ## EOF | ||
diff --git a/contrib/scripts/Makefile.am b/contrib/scripts/Makefile.am index bbb9e6d67..2d4f5584b 100644 --- a/contrib/scripts/Makefile.am +++ b/contrib/scripts/Makefile.am | |||
@@ -3,38 +3,58 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include | |||
3 | 3 | ||
4 | SUBDIRS = gnunet-logread | 4 | SUBDIRS = gnunet-logread |
5 | 5 | ||
6 | noinst_SCRIPTS = \ | ||
7 | terminate.py \ | ||
8 | pydiffer.py \ | ||
9 | removetrailingwhitespace.py \ | ||
10 | gnunet_pyexpect.py \ | ||
11 | gnunet_janitor.py \ | ||
12 | gnunet-chk.py \ | ||
13 | $(awkSCRIPTS) | ||
14 | |||
15 | # FIXME: read into AWK_SCRIPTS autotools builtin. | 6 | # FIXME: read into AWK_SCRIPTS autotools builtin. |
16 | if HAVE_AWK | 7 | if HAVE_AWK |
17 | awkSCRIPTS = \ | 8 | awkSCRIPTS = \ |
18 | check-texinfo.awk | 9 | check-texinfo.awk |
19 | else | 10 | else |
20 | awkSCRIPTS = | 11 | awkSCRIPTS = |
21 | endif | 12 | endif |
22 | 13 | ||
14 | noinst_SCRIPTS = \ | ||
15 | terminate.py \ | ||
16 | pydiffer.py \ | ||
17 | removetrailingwhitespace.py \ | ||
18 | gnunet_pyexpect.py \ | ||
19 | gnunet_janitor.py \ | ||
20 | gnunet-chk.py \ | ||
21 | $(awkSCRIPTS) | ||
22 | |||
23 | bin_SCRIPTS = \ | 23 | bin_SCRIPTS = \ |
24 | gnunet-bugreport \ | 24 | gnunet-bugreport \ |
25 | gnunet-suidfix | 25 | gnunet-suidfix |
26 | 26 | ||
27 | EXTRA_DIST = \ | 27 | EXTRA_DIST = \ |
28 | coverage.sh \ | 28 | coverage.sh \ |
29 | terminate.py.in \ | 29 | terminate.py.in \ |
30 | gnunet_pyexpect.py.in \ | 30 | gnunet_pyexpect.py.in \ |
31 | gnunet_janitor.py.in \ | 31 | gnunet_janitor.py.in \ |
32 | gnunet-chk.py.in \ | 32 | gnunet-chk.py.in \ |
33 | $(SCRIPTS) \ | 33 | removetrailingwhitespace.py.in \ |
34 | removetrailingwhitespace.py.in \ | 34 | pydiffer.py.in \ |
35 | pydiffer.py.in \ | 35 | check-texinfo.awk.in \ |
36 | gnunet-suidfix \ | 36 | build-install-gnunet-debian10.sh \ |
37 | check-texinfo.awk.in | 37 | process_log.sh \ |
38 | generate-monkey-db.sh \ | ||
39 | find_typedefs.py \ | ||
40 | pydmesg \ | ||
41 | visualize_stats.sh \ | ||
42 | changelog_delta.sh \ | ||
43 | debug \ | ||
44 | build_cscope.sh \ | ||
45 | testbed_cleanup.sh \ | ||
46 | lint/lint-man.sh \ | ||
47 | lint/lint-python.sh \ | ||
48 | revisionary.sh \ | ||
49 | netjail/netjail_core.sh \ | ||
50 | netjail/netjail_setup_internet.sh \ | ||
51 | regression.sh \ | ||
52 | doc/texinfo-hacks.el \ | ||
53 | afferify \ | ||
54 | zonewalk-to-types.sh \ | ||
55 | gdb-iterate-dll.py \ | ||
56 | $(SCRIPTS) | ||
57 | |||
38 | 58 | ||
39 | CLEANFILES = \ | 59 | CLEANFILES = \ |
40 | $(noinst_SCRIPTS) | 60 | $(noinst_SCRIPTS) |