Remove libiptc things

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 11a8d3c33ece5bd641350f9e411816d3979a58e9..178319d884d562b5b833213c0a1136b0fbc34fdd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -605,16 +605,6 @@ EXTRA_DIST += \
        units/systemd-nspawn@.service.in \
        units/systemd-update-done.service.in
 
-if HAVE_SYSV_COMPAT
-nodist_systemunit_DATA += \
-       units/rc-local.service \
-       units/halt-local.service
-
-systemgenerator_PROGRAMS += \
-       systemd-sysv-generator \
-       systemd-rc-local-generator
-endif
-
 EXTRA_DIST += \
        units/rc-local.service.in \
        units/halt-local.service.in
@@ -975,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
@@ -1342,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
@@ -1823,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
 
@@ -2187,11 +2140,6 @@ dist_tmpfiles_DATA = \
        tmpfiles.d/x11.conf \
        tmpfiles.d/var.conf
 
-if HAVE_SYSV_COMPAT
-dist_tmpfiles_DATA += \
-       tmpfiles.d/legacy.conf
-endif
-
 SYSINIT_TARGET_WANTS += \
        systemd-tmpfiles-setup-dev.service \
        systemd-tmpfiles-setup.service
@@ -2786,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
@@ -3865,11 +3808,6 @@ TESTS += \
        test/rule-syntax-check.py \
        $(NULL)
 
-if HAVE_SYSV_COMPAT
-TESTS += \
-       test/sysv-generator-test.py \
-       $(NULL)
-endif
 endif
 
 manual_tests += \
@@ -5669,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
 
@@ -5769,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
@@ -5782,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
@@ -6527,24 +6450,6 @@ EXTRA_DIST += \
        man/custom-man.xsl
 
 # ------------------------------------------------------------------------------
-if HAVE_SYSV_COMPAT
-sysvinit_DATA = \
-       docs/sysvinit/README
-
-varlog_DATA = \
-       docs/var-log/README
-
-docs/sysvinit/README: docs/sysvinit/README.in
-       $(SED_PROCESS)
-
-docs/var-log/README: docs/var-log/README.in
-       $(SED_PROCESS)
-
-CLEANFILES += \
-       docs/sysvinit/README \
-       docs/var-log/README
-endif
-
 EXTRA_DIST += \
        docs/sysvinit/README.in \
        docs/var-log/README.in
@@ -6574,17 +6479,6 @@ SYSINIT_TARGET_WANTS += \
        systemd-sysctl.service \
        systemd-ask-password-console.path
 
-if HAVE_SYSV_COMPAT
-SYSTEM_UNIT_ALIASES += \
-       poweroff.target runlevel0.target \
-       rescue.target runlevel1.target \
-       multi-user.target runlevel2.target \
-       multi-user.target runlevel3.target \
-       multi-user.target runlevel4.target \
-       graphical.target runlevel5.target \
-       reboot.target runlevel6.target
-endif
-
 SYSTEM_UNIT_ALIASES += \
        graphical.target default.target \
        reboot.target ctrl-alt-del.target \
@@ -6611,15 +6505,6 @@ GENERAL_ALIASES += \
        $(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
        $(dbussystemservicedir)/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service
 
-if HAVE_SYSV_COMPAT
-INSTALL_DIRS += \
-       $(systemunitdir)/runlevel1.target.wants \
-       $(systemunitdir)/runlevel2.target.wants \
-       $(systemunitdir)/runlevel3.target.wants \
-       $(systemunitdir)/runlevel4.target.wants \
-       $(systemunitdir)/runlevel5.target.wants
-endif
-
 INSTALL_DIRS += \
        $(prefix)/lib/modules-load.d \
        $(sysconfdir)/modules-load.d \
@@ -6668,15 +6553,9 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --enable-kdbus \
        --enable-compat-libs
 
-if HAVE_SYSV_COMPAT
-DISTCHECK_CONFIGURE_FLAGS += \
-       --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
-       --with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
-else
 DISTCHECK_CONFIGURE_FLAGS += \
        --with-sysvinit-path= \
        --with-sysvrcnd-path=
-endif
 
 if HAVE_PYTHON
 DISTCHECK_CONFIGURE_FLAGS += \