Merge remote-tracking branch 'jschlag/master'

[network.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ae66e36079df8b29ec2e5d177a52f8843071a8a3..fe0b0c7bc82b036fcb09c79ef44ebfefb183fcd6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -193,12 +193,12 @@ dist_network_DATA = \
        src/network-radvd-config \
        src/header-config \
        src/header-port \
-       src/header-zone \
-       src/ppp/dialer \
-       src/ppp/pppoe-server
+       src/header-zone
 
 dist_network_SCRIPTS = \
-       src/dhclient-helper
+       src/dhclient-helper \
+       src/ppp/dialer \
+       src/ppp/pppoe-server
 
 dist_helpers_SCRIPTS = \
        src/helpers/dhcpd-config-helper \
@@ -599,6 +599,7 @@ CLEANFILES += \
 NITSI_TESTS = \
        test/nitsi/test/make-check \
        test/nitsi/test/phase1 \
+       test/nitsi/test/pppoe \
        test/nitsi/test/raw-device-get-by-mac \
        test/nitsi/test/zone-new-bridge \
        test/nitsi/test/zone-port-attach-bridge \
@@ -643,12 +644,12 @@ CLEANFILES += \
 NITSI_ENVIRONMENT =
 
 .PHONY: $(NITSI_TESTS)
-$(NITSI_TESTS): % : %/recipe %/settings test/nitsi/test/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) $(NITSI_INCLUDE_RECIPES)
-       $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level debug run-test -d $@ --interactive-error-handling \
-               --default-settings $(abs_builddir)/test/nitsi/test/settings
+$(NITSI_TESTS): % : dist %/recipe %/settings test/nitsi/test/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) $(NITSI_INCLUDE_RECIPES)
+       $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error run-test -d $@ \
+               --default-settings $(abs_builddir)/test/nitsi/test/settings --interactive-error-handling
 
 .PHONY: nitsi
-nitsi: dist $(NITSI_TESTS)
+nitsi: $(NITSI_TESTS)
 
 # Downloads a virtual image file and extracts it
 $(VIRTUAL_ENVIRONMENT_IMAGES):