merge

[oweals/gnunet.git] / contrib / Makefile.am

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 81528a90e76bce862addefe1d76838b681616404..eec3300b9bb58ddbea3bdd245ff138c10b914436 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -5,17 +5,6 @@ tap32dir = $(pkgdatadir)/openvpn-tap32/tapw32/
 
 tap64dir = $(pkgdatadir)/openvpn-tap32/tapw64/
 
-noinst_PROGRAMS = \
- timeout_watchdog
-
-if !MINGW
-timeout_watchdog_SOURCES = \
- timeout_watchdog.c
-else
-timeout_watchdog_SOURCES = \
- timeout_watchdog_w32.c
-endif
-
 noinst_SCRIPTS = \
  scripts/terminate.py \
  scripts/pydiffer.py \
@@ -34,9 +23,6 @@ dist_pkgdata_DATA = \
  branding/logo/gnunet-logo-color.png \
  testing_hostkeys.ecc
 
-bin_PROGRAMS = \
- scripts/gnunet-bugreport
-
 if MINGW
 tap32_DATA = \
  3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \
@@ -63,9 +49,8 @@ EXTRA_DIST = \
  scripts/gnunet-chk.py.in \
  scripts/removetrailingwhitespace.py.in \
  scripts/pydiffer.py.in \
- scripts/gnunet-gns-import.sh \
  packages/nix/default.nix \
- packages/nix/gnunet-dex.nix \
+ packages/nix/gnunet-dev.nix \
  3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \
  3rdparty/Windows/openvpn-tap32/tapw32/tap0901.cat \
  3rdparty/Windows/openvpn-tap32/tapw32/OemWin2k.inf \
@@ -91,8 +76,6 @@ do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 #      chmod +x $@
 #
 # instead of this:
-
-SUFFIXES =
 SUFFIXES = .py.in .py
 
 .py.in.py:
@@ -129,6 +112,7 @@ install-data-local:
            $(INSTALL_DATA) $$hello $(DESTDIR)$(pkghellodir)/ ; \
          fi \
        done
+       install scripts/gnunet-bugreport $(DESTDIR)$(bindir)/gnunet-bugreport
 
 dist-hook:
        if test -d $(srcdir)/hellos; then \