summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am10
-rw-r--r--tools/iptables-unit.c (renamed from unit/test-iptables.c)0
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 9fc159c4..8b302758 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -267,7 +267,7 @@ noinst_PROGRAMS += tools/supplicant-test \
tools/iptables-test tools/tap-test tools/wpad-test \
tools/stats-tool tools/private-network-test \
unit/test-session unit/test-ippool \
- unit/test-iptables
+ tools/iptables-unit
tools_supplicant_test_SOURCES = $(gdbus_sources) tools/supplicant-test.c \
tools/supplicant-dbus.h tools/supplicant-dbus.c \
@@ -311,10 +311,10 @@ unit_test_ippool_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \
unit_test_ippool_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -ldl
unit_objects += $(unit_test_ippool_OBJECTS)
-unit_test_iptables_SOURCES = $(gdbus_sources) src/log.c \
- src/iptables.c src/nat.c unit/test-iptables.c
-unit_test_iptables_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ -ldl
-unit_objects += $(unit_test_iptables_OBJECTS)
+tools_iptables_unit_SOURCES = $(gdbus_sources) src/log.c \
+ src/iptables.c src/nat.c tools/iptables-unit.c
+tools_iptables_unit_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ -ldl
+
endif
test_scripts = test/get-state test/list-services \
diff --git a/unit/test-iptables.c b/tools/iptables-unit.c
index 52aa9193..52aa9193 100644
--- a/unit/test-iptables.c
+++ b/tools/iptables-unit.c