1 files changed, 33 insertions, 55 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index e0370d3c9..b7507d224 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,40 +1,10 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
-SUBDIRS = scripts hellos services
+SUBDIRS = scripts services
 
 include Makefile.inc
 
-dist_pkgdata_DATA = \
-  gns/def.tex \
-  gns/gns-bcd.html \
-  gns/gns-bcd.tex \
-  gns/gns-bcd-forbidden.html \
-  gns/gns-bcd-internal-error.html \
-  gns/gns-bcd-invalid-key.html \
-  gns/gns-bcd-not-found.html \
-  gns/gns-bcd-png.tex \
-  gns/gns-bcd-simple.html \
-  gns/gns-bcd-simple.tex \
-  fcfsd/fcfsd-index.html \
-  fcfsd/fcfsd-forbidden.html \
-  fcfsd/fcfsd-notfound.html \
-  branding/logo/gnunet-logo.png \
-  branding/logo/lynXified-amirouche-v3.svg \
-  branding/logo/gnunet-logo-dark-text.svg \
-  branding/logo/gnunet-logo-color.png \
-  branding/logo/lynXified-amirouche-anonymous-v3.png \
-  branding/logo/gnunet-logo-dark-only-text.svg \
-  branding/logo/gnunet-logo-big.png \
-  branding/logo/gnunet-logo.pdf \
-  testing_hostkeys.ecc \
-  netjail/netjail_core.sh \
-  netjail/netjail_exec.sh \
-  netjail/netjail_start.sh \
-  netjail/netjail_stop.sh \
-  netjail/topo.sh \
-  $(BUILDCOMMON_SHLIB_FILES)
-
 INITD_FILES = \
   services/systemd/gnunet-user.service \
   services/systemd/sysusers-gnunet.conf \
@@ -43,9 +13,10 @@ INITD_FILES = \
   services/openrc/gnunet.initd
 
 PACKAGES_FILES = \
-  packages/guix/guix-env-py2.scm \
-  packages/guix/guix-env-gillmann.scm \
-  packages/guix/notest-guix-env.scm \
+        packages/fedora/10-dns2gns.sh \
+        packages/fedora/gnunet-system.conf \
+        packages/fedora/gnunet.service \
+        packages/fedora/gnunet-user.service \
   packages/alpine/gnunet-gtk/APKBUILD \
   packages/alpine/gnurl/APKBUILD \
   packages/alpine/gnunet/gnunet-user-services.initd \
@@ -58,16 +29,34 @@ PACKAGES_FILES = \
   packages/alpine/gnunet/gnunet.pre-install \
   packages/alpine/gnunet/gnunet-system-services.initd \
   packages/alpine/gnunet/gnunet-gns-proxy.initd \
+  packages/arch/gnunet-git/gnunet.install \
+  packages/arch/gnunet-git/gnunet-system.service \
+  packages/arch/gnunet-git/gnunet.sysusers \
+  packages/arch/gnunet-git/gnunet.tmpfiles \
+  packages/arch/gnunet-git/gnunet-user.conf \
+  packages/arch/gnunet-git/gnunet-user.service \
+  packages/arch/gnunet-git/PKGBUILD \
+  packages/arch/gnunet-git/.SRCINFO \
+  packages/arch/gnunet/gnunet.install \
+  packages/arch/gnunet/gnunet-system.service \
+  packages/arch/gnunet/gnunet.sysusers \
+  packages/arch/gnunet/gnunet.tmpfiles \
+  packages/arch/gnunet/gnunet-user.conf \
+  packages/arch/gnunet/gnunet-user.service \
+  packages/arch/gnunet/PKGBUILD \
+  packages/arch/gnunet/.SRCINFO \
+  packages/guix/guix-env-py2.scm \
+  packages/guix/guix-env-gillmann.scm \
+  packages/guix/notest-guix-env.scm \
+  packages/homebrew/gnunet.rb \
   packages/nix/gnunet-dev.nix \
-  packages/nix/default.nix \
-  packages/homebrew/gnunet.rb
+  packages/nix/default.nix
 
 EXTRA_DIST = \
   sounds/vonlynX-bdbAm-lo.wav \
   sounds/vonlynX-bdbG9-lo.wav \
   sounds/vonlynX-ringtones.txt \
   A-Z.ecc \
-  xdg-scheme-handler/gnunet-uri.desktop \
   xdg-scheme-handler/README.md \
   apparmor/gnunet-daemon-testbed-blacklist \
   apparmor/gnunet-service-identity \
@@ -154,7 +143,6 @@ EXTRA_DIST = \
   apparmor/gnunet-namestore-gtk \
   apparmor/gnunet-service-testbed-logger \
   apparmor/gnunet-peerstore \
-  apparmor/gnunet-namestore-fcfsd \
   apparmor/gnunet-core \
   apparmor/gnunet-gns-import.sh \
   apparmor/gnunet-gns-proxy \
@@ -195,23 +183,17 @@ EXTRA_DIST = \
   conf/nss/nssswitch.conf \
   testbed_configs/testbed_cluster.conf \
   testbed_configs/testbed_supermuc.conf \
-  guix.README \
+  packages/guix/guix.README \
   web/log.php \
-  ci/docker/docker-entrypoint.sh \
-  ci/docker/Dockerfile \
   ci/buildbot/buildbot-update.sh \
   ci/buildbot/ssh-keys \
   ci/buildbot/ssh-config \
   docker/docker-entrypoint.sh \
   docker/Dockerfile \
   docker/README.md \
-  docker/gnunet.conf \
   benchmark/collect.awk \
-  gnunet_infrastructure/handbook_pull.sh \
-  guix.scm \
-  indent_pre-commit \
+  packages/guix/guix.scm \
   Makefile.inc \
-  gnunet.m4 \
   vagrant/Vagrantfile \
   vagrant/bootstrap.ubuntu.sh \
   privacy-sensitive-symbols.mspec \
@@ -221,8 +203,7 @@ EXTRA_DIST = \
   patches/lrn-indent.diff \
   test_gnunet_prefix.c \
   $(PACKAGES_FILES) \
-  $(INITD_FILES) \
-  $(BUILD_COMMON_FILES)
+  $(INITD_FILES)
 
 check_PROGRAMS = \
   test_gnunet_prefix
@@ -246,14 +227,11 @@ test_gnunet_prefix_LDADD = \
   $(LIBLTDL) -lunistring $(XLIB)
 
 aclocaldir = $(datadir)/aclocal
-aclocal_DATA = \
+dist_aclocal_DATA = \
   gnunet.m4
 
-install-data-hook:
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_core.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_start.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_stop.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_exec.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/topo.sh'
+xdgdeentrydir = $(datadir)/applications
+dist_xdgdeentry_DATA = \
+  xdg-scheme-handler/gnunet-uri.desktop
 
 ## EOF