use -Wl on -no-undefined as it is a linker option:

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

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 5cef063dde101e907ecc8aa9b8462fc6817b297b..eacfa8295f614542cc2a798933af6dfd00ba66d8 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,18 +1,23 @@
-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
 
 if !MINGW
 timeout_watchdog_SOURCES = \
- timeout_watchdog.c 
+ timeout_watchdog.c
 else
 timeout_watchdog_SOURCES = \
  timeout_watchdog_w32.c
 endif
 
 noinst_SCRIPTS = \
+ terminate.py \
+ pydiffer.py \
  gnunet_pyexpect.py \
  gnunet_janitor.py
 
@@ -20,16 +25,44 @@ bin_SCRIPTS = \
  gnunet-gns-import.sh
 
 dist_pkgdata_DATA = \
+ gns-bcd.html \
+ gns-bcd.tex \
+ gnunet-logo.pdf \
  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
+
+CLEANFILES = \
+  $(noinst_SCRIPTS)
 
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
@@ -43,19 +76,28 @@ do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 # gnmessage.sh \
 # junkinsert.sh \
 # junklookup.sh \
-# namespacehelper.sh 
+# namespacehelper.sh
 
 
 check_PROGRAMS = \
  test_gnunet_prefix
 
+if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
+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