summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2015-04-08 08:49:11 +0200
committerAndy Wingo <wingo@pobox.com>2015-04-08 08:49:11 +0200
commit8de00a217253eb9a249eec5210177e6d2bdb0557 (patch)
tree4002b961f670758a6347af0cdca20d61ee926a5b /Makefile.am
parenta3b23257872fe2f8cf99aa2da008f55ada583bb3 (diff)
Remove libiptc things
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am57
1 files changed, 0 insertions, 57 deletions
diff --git a/Makefile.am b/Makefile.am
index 135e7b35c2..178319d884 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -965,24 +965,6 @@ libsystemd_label_la_LIBADD = \
# -----------------------------------------------------------------------------
-if HAVE_LIBIPTC
-noinst_LTLIBRARIES += \
- libsystemd-fw.la
-
-libsystemd_fw_la_SOURCES = \
- src/shared/fw-util.h \
- src/shared/fw-util.c
-
-libsystemd_fw_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(LIBIPTC_CFLAGS)
-
-libsystemd_fw_la_LIBADD = \
- $(LIBIPTC_LIBS)
-endif
-
-# -----------------------------------------------------------------------------
-
if ENABLE_LDCONFIG
dist_systemunit_DATA += \
units/ldconfig.service
@@ -1332,11 +1314,6 @@ manual_tests += \
test-ipcrm \
test-btrfs
-if HAVE_LIBIPTC
-manual_tests += \
- test-fw-util
-endif
-
if HAVE_KMOD
manual_tests += \
test-rtnl-manual
@@ -1813,20 +1790,6 @@ test_btrfs_LDADD = \
libsystemd-label.la \
libsystemd-shared.la
-if HAVE_LIBIPTC
-test_fw_util_SOURCES = \
- src/test/test-fw-util.c
-
-test_fw_util_CFLAGS = \
- $(AM_CFLAGS) \
- $(LIBIPTC_CFLAGS)
-
-test_fw_util_LDADD = \
- libsystemd-fw.la \
- libsystemd-shared.la \
- $(LIBIPTC_LIBS)
-endif
-
test_rtnl_manual_SOURCES = \
src/test/test-rtnl-manual.c
@@ -2771,11 +2734,6 @@ systemd_nspawn_LDADD += \
$(SECCOMP_LIBS)
endif
-if HAVE_LIBIPTC
-systemd_nspawn_LDADD += \
- libsystemd-fw.la
-endif
-
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
src/run/run.c
@@ -5649,11 +5607,6 @@ systemd_networkd_SOURCES = \
systemd_networkd_LDADD = \
libsystemd-networkd-core.la
-if HAVE_LIBIPTC
-systemd_networkd_LDADD += \
- libsystemd-fw.la
-endif
-
noinst_LTLIBRARIES += \
libsystemd-networkd-core.la
@@ -5749,11 +5702,6 @@ test_network_SOURCES = \
test_network_LDADD = \
libsystemd-networkd-core.la
-if HAVE_LIBIPTC
-test_network_LDADD += \
- libsystemd-fw.la
-endif
-
test_network_tables_SOURCES = \
src/network/test-network-tables.c \
src/shared/test-tables.h
@@ -5762,11 +5710,6 @@ test_network_tables_LDADD = \
libsystemd-networkd-core.la \
libudev-core.la
-if HAVE_LIBIPTC
-test_network_tables_LDADD += \
- libsystemd-fw.la
-endif
-
tests += \
test-network \
test-network-tables