-indentation, code cleanup

[oweals/gnunet.git] / src / integration-tests / Makefile.am

diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 72a2fa9df5b8ff3c856cb2f4b4f54153edc8f393..e28e5446995d44ef89dac015990e16d7c940b2a9 100644 (file)
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
@@ -126,8 +126,8 @@ EXTRA_DIST = \
    test_integration_restart.py.in \
    test_integration_clique.py.in \
    test_integration_clique_nat.py.in \
+   confs/test_defaults.conf \
    confs/c_bootstrap_server.conf \
-   confs/c_bootstrap_server_w_massif.conf \
    confs/c_nat_client.conf \
    confs/c_no_nat_client_2.conf \
    confs/c_no_nat_client.conf \
@@ -142,8 +142,8 @@ EXTRA_DIST = \
    confs/c_no_nat_client_unix_2.conf \
    hostkeys/c_bootstrap_server \
    hostkeys/c_no_nat_client \
+   hostkeys/c_no_nat_client_2 \
    hostkeys/c_nat_client \
-   hostkeys/0003-hostkey \
    hostkeys/0004-hostkey \
    hostkeys/0005-hostkey \
    hostkeys/0006-hostkey \