diff options
author | Andy Wingo <wingo@pobox.com> | 2015-04-08 08:45:34 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2015-04-08 08:45:34 +0200 |
commit | a3b23257872fe2f8cf99aa2da008f55ada583bb3 (patch) | |
tree | 5e567add541f736045ca70199089cc423764d321 /Makefile.am | |
parent | 31ad69aaf459ac5f4d52c604ec2df7cb0793708e (diff) |
Remove SysV compat
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/Makefile.am b/Makefile.am index 11a8d3c33e..135e7b35c2 100644 --- 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 @@ -2187,11 +2177,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 @@ -3865,11 +3850,6 @@ TESTS += \ test/rule-syntax-check.py \ $(NULL) -if HAVE_SYSV_COMPAT -TESTS += \ - test/sysv-generator-test.py \ - $(NULL) -endif endif manual_tests += \ @@ -6527,24 +6507,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 +6536,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 +6562,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 +6610,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 += \ |