- notify clients when a tunnel times out

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

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 5c892ecc7a2a5f4ca2266b7f8b4b56faaa586c0d..501758369b8775664670cd93f4d3ae0db2ac0cc0 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,34 +1,43 @@
 INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 
-if !MINGW
 noinst_PROGRAMS = \
  timeout_watchdog
 
+if !MINGW
 timeout_watchdog_SOURCES = \
  timeout_watchdog.c 
+else
+timeout_watchdog_SOURCES = \
+ timeout_watchdog_w32.c
 endif
 
 noinst_SCRIPTS = \
+ terminate.py \
+ pydiffer.py \
  gnunet_pyexpect.py \
  gnunet_janitor.py
 
+bin_SCRIPTS = \
+ gnunet-gns-import.sh
+
 dist_pkgdata_DATA = \
- gnunet-logo-color.png 
+ gnunet-logo-color.png \
+ testing_hostkeys.dat
 
 EXTRA_DIST = \
  coverage.sh \
- hostlist.cgi \
- hostlist.php \
  report.sh \
- testing_hostkeys.dat \
+ terminate.py.in \
  gnunet_pyexpect.py.in \
- gnunet_janitor.py.in
+ gnunet_janitor.py.in \
+ pydiffer.py.in \
+ gnunet-gns-import.sh
 
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
 %.py: %.py.in Makefile
-       $(do_subst) < $(srcdir)/$< > $@
+       $(do_subst) < $< > $@
        chmod +x $@
 
 # init_gnunet_redhat \
@@ -45,3 +54,30 @@ check_PROGRAMS = \
 
 test_gnunet_prefix_SOURCES = \
  test_gnunet_prefix.c
+
+test_gnunet_prefix_LDADD = \
+  $(GCLIBADD) $(WINLIB) \
+  $(LTLIBICONV) \
+  -lltdl -lunistring $(XLIB) 
+
+pkghellodir= $(pkgdatadir)/hellos
+
+install-data-local:
+       $(mkinstalldirs) $(DESTDIR)$(pkghellodir)
+       @$(NORMAL_INSTALL)
+       for hello in $(srcdir)/hellos/*; do \
+         if test -f $$hello; then \
+           $(INSTALL_DATA) $$hello $(DESTDIR)$(pkghellodir)/ ; \
+         fi \
+       done
+
+dist-hook:
+       if test -d $(srcdir)/hellos; then \
+         mkdir -p $(distdir)/hellos; \
+         for hello in $(srcdir)/hellos/*; do \
+           if test -f $$hello; then \
+             cp -p $$hello $(distdir)/hellos; \
+           fi \
+         done \
+       fi
+