projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doxygen docu
[oweals/gnunet.git]
/
contrib
/
Makefile.am
diff --git
a/contrib/Makefile.am
b/contrib/Makefile.am
index 88f3a0677be1877214d8f41a8784945c89bce267..f36922b202c9d6444d664963cb856632acffb0a0 100644
(file)
--- a/
contrib/Makefile.am
+++ b/
contrib/Makefile.am
@@
-1,4
+1,4
@@
-
INCLUDE
S = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+
AM_CPPFLAG
S = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
tap32dir = $(pkgdatadir)/openvpn-tap32/tapw32/
tap32dir = $(pkgdatadir)/openvpn-tap32/tapw32/
@@
-9,7
+9,7
@@
noinst_PROGRAMS = \
if !MINGW
timeout_watchdog_SOURCES = \
if !MINGW
timeout_watchdog_SOURCES = \
- timeout_watchdog.c
+ timeout_watchdog.c
else
timeout_watchdog_SOURCES = \
timeout_watchdog_w32.c
else
timeout_watchdog_SOURCES = \
timeout_watchdog_w32.c
@@
-25,8
+25,10
@@
bin_SCRIPTS = \
gnunet-gns-import.sh
dist_pkgdata_DATA = \
gnunet-gns-import.sh
dist_pkgdata_DATA = \
+ gns-bcd.html \
+ gns-bcd.tex \
+ gnunet-logo.pdf \
gnunet-logo-color.png \
gnunet-logo-color.png \
- testing_hostkeys.dat \
testing_hostkeys.ecc
if MINGW
testing_hostkeys.ecc
if MINGW
@@
-54,7
+56,13
@@
EXTRA_DIST = \
openvpn-tap32/tapw32/OemWin2k.inf \
openvpn-tap32/tapw64/tap0901.sys \
openvpn-tap32/tapw64/tap0901.cat \
openvpn-tap32/tapw32/OemWin2k.inf \
openvpn-tap32/tapw64/tap0901.sys \
openvpn-tap32/tapw64/tap0901.cat \
- openvpn-tap32/tapw64/OemWin2k.inf
+ 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'
do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
@@
-68,27
+76,33
@@
do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
# gnmessage.sh \
# junkinsert.sh \
# junklookup.sh \
# gnmessage.sh \
# junkinsert.sh \
# junklookup.sh \
-# namespacehelper.sh
+# namespacehelper.sh
check_PROGRAMS = \
test_gnunet_prefix
check_PROGRAMS = \
test_gnunet_prefix
+if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
TESTS = $(check_PROGRAMS)
TESTS = $(check_PROGRAMS)
+endif
test_gnunet_prefix_SOURCES = \
test_gnunet_prefix.c
test_gnunet_prefix_SOURCES = \
test_gnunet_prefix.c
+test_gnunet_prefix_CPPFLAGS = \
+ $(LTDLINCL) $(AM_CPPFLAGS)
+
test_gnunet_prefix_LDADD = \
$(GCLIBADD) $(WINLIB) \
$(LTLIBICONV) \
$(GN_LIBINTL) \
test_gnunet_prefix_LDADD = \
$(GCLIBADD) $(WINLIB) \
$(LTLIBICONV) \
$(GN_LIBINTL) \
- -lltdl -lunistring $(XLIB)
+ $(LIBLTDL) -lunistring $(XLIB)
pkghellodir= $(pkgdatadir)/hellos
install-data-local:
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 \
@$(NORMAL_INSTALL)
for hello in $(srcdir)/hellos/*; do \
if test -f $$hello; then \