X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=contrib%2FMakefile.am;h=db9e6d74773be81047822d4b1be1cbec1411b36d;hb=2edb40d94fbaae988cf91e9e6d2a295515fc387d;hp=5cef063dde101e907ecc8aa9b8462fc6817b297b;hpb=599fdbabddfa5c2047fd28e341ccdfdc6353d06b;p=oweals%2Fgnunet.git

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 5cef063dd..db9e6d747 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,5 +1,8 @@
-INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
+tap32dir = $(pkgdatadir)/openvpn-tap32/tapw32/
+
+tap64dir = $(pkgdatadir)/openvpn-tap32/tapw64/
 
 noinst_PROGRAMS = \
  timeout_watchdog
@@ -13,6 +16,8 @@ timeout_watchdog_SOURCES = \
 endif
 
 noinst_SCRIPTS = \
+ terminate.py \
+ pydiffer.py \
  gnunet_pyexpect.py \
  gnunet_janitor.py
 
@@ -21,15 +26,37 @@ bin_SCRIPTS = \
 
 dist_pkgdata_DATA = \
  gnunet-logo-color.png \
- testing_hostkeys.dat
+ testing_hostkeys.ecc
+
+if MINGW
+tap32_DATA = \
+ openvpn-tap32/tapw32/tap0901.sys \
+ openvpn-tap32/tapw32/tap0901.cat \
+ openvpn-tap32/tapw32/OemWin2k.inf
+
+tap64_DATA = \
+ openvpn-tap32/tapw64/tap0901.sys \
+ openvpn-tap32/tapw64/tap0901.cat \
+ openvpn-tap32/tapw64/OemWin2k.inf
+endif
 
 EXTRA_DIST = \
  coverage.sh \
- hostlist.cgi \
- hostlist.php \
  report.sh \
+ terminate.py.in \
  gnunet_pyexpect.py.in \
- gnunet_janitor.py.in
+ gnunet_janitor.py.in \
+ pydiffer.py.in \
+ gnunet-gns-import.sh \
+ openvpn-tap32/tapw32/tap0901.sys \
+ openvpn-tap32/tapw32/tap0901.cat \
+ openvpn-tap32/tapw32/OemWin2k.inf \
+ openvpn-tap32/tapw64/tap0901.sys \
+ openvpn-tap32/tapw64/tap0901.cat \
+ openvpn-tap32/tapw64/OemWin2k.inf \
+ openvpn-tap32/INSTALL \
+ openvpn-tap32/tap32-signed-i386-2.1.zip \
+ openvpn-tap32/tap32-source-2.1.zip 
 
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
@@ -49,18 +76,26 @@ do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 check_PROGRAMS = \
  test_gnunet_prefix
 
+if ENABLE_TEST_RUN
+TESTS = $(check_PROGRAMS)
+endif
+
 test_gnunet_prefix_SOURCES = \
  test_gnunet_prefix.c
 
+test_gnunet_prefix_CPPFLAGS = \
+  $(LTDLINCL) $(AM_CPPFLAGS)
+
 test_gnunet_prefix_LDADD = \
   $(GCLIBADD) $(WINLIB) \
   $(LTLIBICONV) \
-  -lltdl -lunistring $(XLIB) 
+  $(GN_LIBINTL) \
+  $(LIBLTDL) -lunistring $(XLIB) 
 
 pkghellodir= $(pkgdatadir)/hellos
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(pkghellodir)
+	$(mkinstalldirs) $(DESTDIR)$(pkghellodir) 
 	@$(NORMAL_INSTALL)
 	for hello in $(srcdir)/hellos/*; do \
 	  if test -f $$hello; then \