X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=135e7b35c25aaeb9cd9849e5cb1dd0077e30b26a;hb=a3b23257872fe2f8cf99aa2da008f55ada583bb3;hp=9509247ec1d918e0e768dfea48e7e38c550fb914;hpb=57fa1d094cd2c5ac68970526ad0a0754c548e75d;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 9509247ec..135e7b35c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -404,11 +404,6 @@ rootlibexec_PROGRAMS = \
 	systemd-socket-proxyd \
 	systemd-update-done
 
-if HAVE_UTMP
-rootlibexec_PROGRAMS += \
-	systemd-update-utmp
-endif
-
 systemgenerator_PROGRAMS = \
 	systemd-getty-generator \
 	systemd-fstab-generator \
@@ -565,12 +560,6 @@ nodist_systemunit_DATA = \
 	units/systemd-nspawn@.service \
 	units/systemd-update-done.service
 
-if HAVE_UTMP
-nodist_systemunit_DATA += \
-	units/systemd-update-utmp.service \
-	units/systemd-update-utmp-runlevel.service
-endif
-
 dist_userunit_DATA = \
 	units/user/basic.target \
 	units/user/default.target \
@@ -592,8 +581,6 @@ EXTRA_DIST += \
 	units/systemd-initctl.service.in \
 	units/systemd-shutdownd.service.in \
 	units/systemd-remount-fs.service.in \
-	units/systemd-update-utmp.service.in \
-	units/systemd-update-utmp-runlevel.service.in \
 	units/systemd-ask-password-wall.service.in \
 	units/systemd-ask-password-console.service.in \
 	units/systemd-sysctl.service.in \
@@ -618,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
@@ -833,7 +810,6 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/cgroup-show.h \
 	src/shared/unit-name.c \
 	src/shared/unit-name.h \
-	src/shared/utmp-wtmp.h \
 	src/shared/watchdog.c \
 	src/shared/watchdog.h \
 	src/shared/spawn-ask-password-agent.c \
@@ -911,11 +887,6 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/sysctl-util.c \
 	src/shared/sysctl-util.h
 
-if HAVE_UTMP
-libsystemd_shared_la_SOURCES += \
-	src/shared/utmp-wtmp.c
-endif
-
 nodist_libsystemd_shared_la_SOURCES = \
 	src/shared/errno-from-name.h \
 	src/shared/errno-to-name.h \
@@ -2097,19 +2068,6 @@ systemd_initctl_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
-# ------------------------------------------------------------------------------
-systemd_update_utmp_SOURCES = \
-	src/update-utmp/update-utmp.c
-
-systemd_update_utmp_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(AUDIT_CFLAGS)
-
-systemd_update_utmp_LDADD = \
-	libsystemd-internal.la \
-	libsystemd-shared.la \
-	$(AUDIT_LIBS)
-
 # ------------------------------------------------------------------------------
 systemd_update_done_SOURCES = \
 	src/update-done/update-done.c
@@ -2144,6 +2102,7 @@ systemd_shutdown_SOURCES = \
 systemd_shutdown_LDADD = \
 	libsystemd-label.la \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2218,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
@@ -2345,6 +2299,7 @@ systemd_fsck_SOURCES = \
 systemd_fsck_LDADD = \
 	libsystemd-internal.la \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2380,6 +2335,7 @@ systemd_ac_power_SOURCES = \
 
 systemd_ac_power_LDADD = \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2651,8 +2607,8 @@ systemd_gpt_auto_generator_SOURCES = \
 
 systemd_gpt_auto_generator_LDADD = \
 	libsystemd-label.la \
-	libsystemd-internal.la \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la \
 	$(BLKID_LIBS)
 
@@ -2804,8 +2760,8 @@ systemd_nspawn_CFLAGS = \
 
 systemd_nspawn_LDADD = \
 	libsystemd-label.la \
-	libsystemd-internal.la \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la \
 	$(BLKID_LIBS)
 
@@ -3601,12 +3557,6 @@ src/libsystemd-terminal/unifont-glyph-array.bin: tools/compile-unifont.py $(UNIF
 
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
-SUBDIRS += \
-	docs/libudev
-
-noinst_DATA += \
-	docs/html/libudev \
-	docs/html/gudev
 endif
 
 include_HEADERS += \
@@ -3618,10 +3568,12 @@ lib_LTLIBRARIES += \
 libudev_la_SOURCES =\
 	src/libudev/libudev.sym \
 	src/libudev/libudev-private.h \
+	src/libudev/libudev-device-internal.h \
 	src/libudev/libudev.c \
 	src/libudev/libudev-list.c \
 	src/libudev/libudev-util.c \
 	src/libudev/libudev-device.c \
+	src/libudev/libudev-device-private.c \
 	src/libudev/libudev-enumerate.c \
 	src/libudev/libudev-monitor.c \
 	src/libudev/libudev-queue.c \
@@ -3646,18 +3598,6 @@ pkgconfiglib_DATA += \
 EXTRA_DIST += \
 	src/libudev/libudev.pc.in
 
-CLEANFILES += \
-	docs/html/libudev \
-	docs/html/gudev
-
-docs/html/libudev:
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_LN)$(LN_S) -f ../libudev/html $@
-
-docs/html/gudev:
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_LN)$(LN_S) -f ../gudev/html $@
-
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libudev-install-hook:
 	libname=libudev.so && $(move-to-rootlibdir)
@@ -3673,8 +3613,7 @@ noinst_LTLIBRARIES += \
 	libudev-internal.la
 
 libudev_internal_la_SOURCES =\
-	$(libudev_la_SOURCES) \
-	src/libudev/libudev-device-private.c
+	$(libudev_la_SOURCES)
 
 libudev_internal_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -3859,9 +3798,9 @@ systemd_hwdb_SOURCES = \
 	src/hwdb/hwdb.c
 
 systemd_hwdb_LDADD = \
+	libudev-internal.la \
 	libsystemd-shared.la \
-	libsystemd-internal.la \
-	libudev-internal.la
+	libsystemd-internal.la
 
 rootbin_PROGRAMS += \
 	systemd-hwdb
@@ -3911,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 += \
@@ -3971,6 +3905,7 @@ ata_id_SOURCES = \
 
 ata_id_LDADD = \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -3982,6 +3917,7 @@ cdrom_id_SOURCES = \
 
 cdrom_id_LDADD = \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -3996,6 +3932,7 @@ collect_SOURCES = \
 
 collect_LDADD = \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4010,6 +3947,7 @@ scsi_id_SOURCES =\
 
 scsi_id_LDADD = \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4024,6 +3962,7 @@ v4l_id_SOURCES = \
 
 v4l_id_LDADD = \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4038,6 +3977,7 @@ accelerometer_SOURCES = \
 
 accelerometer_LDADD = \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4049,8 +3989,6 @@ dist_udevrules_DATA += \
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
 if ENABLE_GTK_DOC
-SUBDIRS += \
-	docs/gudev
 endif
 
 libgudev_includedir = \
@@ -4937,6 +4875,7 @@ systemd_backlight_SOURCES = \
 systemd_backlight_LDADD = \
 	libsystemd-label.la \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 endif
 
@@ -4957,6 +4896,7 @@ systemd_rfkill_SOURCES = \
 systemd_rfkill_LDADD = \
 	libsystemd-label.la \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 endif
 
@@ -4985,6 +4925,7 @@ systemd_cryptsetup_CFLAGS = \
 systemd_cryptsetup_LDADD = \
 	libsystemd-label.la \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la \
 	$(LIBCRYPTSETUP_LIBS)
 
@@ -5280,8 +5221,8 @@ libsystemd_machine_core_la_SOURCES = \
 
 libsystemd_machine_core_la_LIBADD = \
 	libsystemd-label.la \
-	libsystemd-internal.la \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 noinst_LTLIBRARIES += \
@@ -5797,8 +5738,8 @@ networkctl_SOURCES = \
 	src/network/networkctl.c
 
 networkctl_LDADD = \
-	libsystemd-internal.la \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la \
 	libsystemd-network.la
 
@@ -5905,8 +5846,8 @@ libsystemd_logind_core_la_SOURCES = \
 
 libsystemd_logind_core_la_LIBADD = \
 	libsystemd-label.la \
-	libsystemd-internal.la \
 	libudev-internal.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la
 
 if HAVE_ACL
@@ -5929,10 +5870,10 @@ loginctl_SOURCES = \
 	src/login/sysfs-show.c
 
 loginctl_LDADD = \
+	libudev-internal.la \
 	libsystemd-internal.la \
 	libsystemd-logs.la \
 	libsystemd-journal-internal.la \
-	libudev-internal.la \
 	libsystemd-shared.la
 
 rootbin_PROGRAMS += \
@@ -6566,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
@@ -6592,20 +6515,6 @@ SOCKETS_TARGET_WANTS += \
 	systemd-initctl.socket \
 	systemd-shutdownd.socket
 
-if HAVE_UTMP
-if HAVE_SYSV_COMPAT
-MULTI_USER_TARGET_WANTS += \
-	systemd-update-utmp-runlevel.service
-GRAPHICAL_TARGET_WANTS += \
-	systemd-update-utmp-runlevel.service
-RESCUE_TARGET_WANTS += \
-	systemd-update-utmp-runlevel.service
-endif
-
-SYSINIT_TARGET_WANTS += \
-	systemd-update-utmp.service
-endif
-
 SYSINIT_TARGET_WANTS += \
 	systemd-update-done.service
 
@@ -6627,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 \
@@ -6664,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 \
@@ -6721,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 += \