-some code cleanup

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

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index e4b92bb2e87b86ede9ff2ff204cf7f1d0db2671d..df6bdc275b9220223eaa70f96ac819d66f7a2387 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,3 +1,6 @@
+INCLUDES = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+
+
 if !MINGW
 noinst_PROGRAMS = \
  timeout_watchdog
@@ -7,27 +10,26 @@ timeout_watchdog_SOURCES = \
 endif
 
 noinst_SCRIPTS = \
- gnunet_pyexpect/gnunet_pyexpect.py
+ gnunet_pyexpect.py \
+ gnunet_janitor.py
 
 dist_pkgdata_DATA = \
- gnunet-logo-color.png \
- defaults.conf
+ gnunet-logo-color.png 
 
 EXTRA_DIST = \
  coverage.sh \
  hostlist.cgi \
  hostlist.php \
  report.sh \
- gnunet_pyexpect/__init__.py \
- gnunet_pyexpect/gnunet_pyexpect.py.in
+ testing_hostkeys.dat \
+ gnunet_pyexpect.py.in \
+ gnunet_janitor.py.in
 
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
-gnunet_pyexpect/gnunet_pyexpect.py: gnunet_pyexpect/gnunet_pyexpect.py.in Makefile
-       $(do_subst) < $(srcdir)/gnunet_pyexpect/gnunet_pyexpect.py.in > gnunet_pyexpect/gnunet_pyexpect.py
-       chmod +x gnunet_pyexpect/gnunet_pyexpect.py
-       chmod +x gnunet_pyexpect/__init__.py
-
+%.py: %.py.in Makefile
+       $(do_subst) < $< > $@
+       chmod +x $@
 
 # init_gnunet_redhat \
 # init_gnunet_ubuntu \
@@ -37,3 +39,9 @@ gnunet_pyexpect/gnunet_pyexpect.py: gnunet_pyexpect/gnunet_pyexpect.py.in Makefi
 # junklookup.sh \
 # namespacehelper.sh 
 
+
+check_PROGRAMS = \
+ test_gnunet_prefix
+
+test_gnunet_prefix_SOURCES = \
+ test_gnunet_prefix.c