chiark / gitweb /
Remove libiptc things
[elogind.git] / Makefile.am
index 19071d9ffc4c19555831996cf59c52d25a085d69..178319d884d562b5b833213c0a1136b0fbc34fdd 100644 (file)
@@ -118,8 +118,6 @@ rootprefix=@rootprefix@
 rootbindir=$(rootprefix)/bin
 rootlibexecdir=$(rootprefix)/lib/systemd
 
-CLEANFILES = $(BUILT_SOURCES)
-DISTCLEANFILES =
 EXTRA_DIST =
 BUILT_SOURCES =
 INSTALL_EXEC_HOOKS =
@@ -161,6 +159,15 @@ TESTS =
 endif
 udevlibexec_PROGRAMS =
 
+in_files = $(filter %.in,$(EXTRA_DIST))
+in_in_files = $(filter %.in.in, $(in_files))
+m4_files = $(filter %.m4,$(EXTRA_DIST) $(in_files:.m4.in=.m4))
+
+CLEANFILES = $(BUILT_SOURCES) \
+       $(pkgconfiglib_DATA) \
+       $(in_files:.in=) $(in_in_files:.in.in=) \
+       $(m4_files:.m4=)
+
 .PHONY: $(INSTALL_EXEC_HOOKS) $(UNINSTALL_EXEC_HOOKS) \
        $(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS) \
        $(DISTCLEAN_LOCAL_HOOKS) $(CLEAN_LOCAL_HOOKS)
@@ -224,6 +231,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/libsystemd/sd-rtnl \
        -I $(top_srcdir)/src/libsystemd/sd-network \
        -I $(top_srcdir)/src/libsystemd/sd-hwdb \
+       -I $(top_srcdir)/src/libsystemd/sd-device \
        -I $(top_srcdir)/src/libsystemd-network \
        -I $(top_srcdir)/src/libsystemd-terminal \
        $(OUR_CPPFLAGS)
@@ -396,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 \
@@ -557,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 \
@@ -584,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 \
@@ -610,22 +605,6 @@ EXTRA_DIST += \
        units/systemd-nspawn@.service.in \
        units/systemd-update-done.service.in
 
-CLEANFILES += \
-       units/console-shell.service.m4 \
-       units/console-getty.service.m4 \
-       units/container-getty@.service.m4 \
-       units/user@.service.m4
-
-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
@@ -831,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 \
@@ -842,8 +820,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/spawn-polkit-agent.h \
        src/shared/clock-util.c \
        src/shared/clock-util.h \
-       src/shared/time-dst.c \
-       src/shared/time-dst.h \
        src/shared/calendarspec.c \
        src/shared/calendarspec.h \
        src/shared/fileio.c \
@@ -907,12 +883,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/sigbus.h \
        src/shared/build.h \
        src/shared/import-util.c \
-       src/shared/import-util.h
-
-if HAVE_UTMP
-libsystemd_shared_la_SOURCES += \
-       src/shared/utmp-wtmp.c
-endif
+       src/shared/import-util.h \
+       src/shared/sysctl-util.c \
+       src/shared/sysctl-util.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -992,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
@@ -1223,35 +1178,34 @@ src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
 
-EXTRA_DIST += \
+gperf_gperf_m4_sources = \
        src/core/load-fragment-gperf.gperf.m4
 
-CLEANFILES += \
-       src/core/load-fragment-gperf.gperf \
-       src/core/load-fragment-gperf.c \
-       src/core/load-fragment-gperf-nulstr.c \
+gperf_txt_sources = \
        src/shared/errno-list.txt \
-       src/shared/errno-from-name.gperf \
        src/shared/af-list.txt \
-       src/shared/af-from-name.gperf \
        src/shared/arphrd-list.txt \
-       src/shared/arphrd-from-name.gperf \
-       src/shared/cap-list.txt \
-       src/shared/cap-from-name.gperf \
-       src/resolve/dns_type-list.txt \
-       src/resolve/dns_type-from-name.gperf
+       src/shared/cap-list.txt
 
 BUILT_SOURCES += \
-       src/shared/errno-from-name.h \
-       src/shared/errno-to-name.h \
-       src/shared/af-from-name.h \
-       src/shared/af-to-name.h \
-       src/shared/arphrd-from-name.h \
-       src/shared/arphrd-to-name.h \
-       src/shared/cap-from-name.h \
-       src/shared/cap-to-name.h \
-       src/resolve/dns_type-from-name.h \
-       src/resolve/dns_type-to-name.h
+       $(gperf_gperf_m4_sources:-gperf.gperf.m4=-gperf.c) \
+       $(gperf_gperf_m4_sources:-gperf.gperf.m4=-gperf-nulstr.c) \
+       $(gperf_gperf_sources:-gperf.gperf=-gperf.c) \
+       $(gperf_txt_sources:-list.txt=-from-name.h) \
+       $(gperf_txt_sources:-list.txt=-to-name.h)
+
+CLEANFILES += \
+       $(gperf_txt_sources:-list.txt=-from-name.gperf)
+DISTCLEANFILES = \
+       $(gperf_txt_sources)
+
+EXTRA_DIST += \
+       $(gperf_gperf_m4_sources) \
+       $(gperf_gperf_sources) \
+       $(gperf_txt_sources:-list.txt=-from-name.gperf)
+
+CLEANFILES += \
+       $(gperf_txt_sources)
 
 %-from-name.gperf: %-list.txt
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $(notdir $*)_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
@@ -1346,10 +1300,6 @@ EXTRA_DIST += \
        src/core/systemd.pc.in \
        src/core/macros.systemd.in
 
-CLEANFILES += \
-       src/core/macros.systemd \
-       src/core/org.freedesktop.systemd1.policy.in
-
 # ------------------------------------------------------------------------------
 
 manual_tests += \
@@ -1364,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
@@ -1725,9 +1670,6 @@ test_verbs_LDADD = \
 test_namespace_LDADD = \
        libsystemd-core.la
 
-CLEANFILES += \
-       src/test/test-hashmap-ordered.c
-
 BUILT_SOURCES += \
        src/test/test-hashmap-ordered.c
 
@@ -1848,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
 
@@ -2103,19 +2031,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
@@ -2150,6 +2065,7 @@ systemd_shutdown_SOURCES = \
 systemd_shutdown_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2224,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
@@ -2251,10 +2162,6 @@ EXTRA_DIST += \
        units/systemd-tmpfiles-setup.service.in \
        units/systemd-tmpfiles-clean.service.in
 
-CLEANFILES += \
-       tmpfiles.d/systemd.conf \
-       tmpfiles.d/etc.conf
-
 # ------------------------------------------------------------------------------
 if ENABLE_SYSUSERS
 systemd_sysusers_SOURCES = \
@@ -2284,10 +2191,6 @@ EXTRA_DIST += \
        sysusers.d/systemd.conf.m4 \
        sysusers.d/basic.conf.in
 
-CLEANFILES += \
-       sysusers.d/systemd.conf \
-       sysusers.d/basic.conf
-
 INSTALL_DIRS += \
        $(sysusersdir)
 endif
@@ -2359,6 +2262,7 @@ systemd_fsck_SOURCES = \
 systemd_fsck_LDADD = \
        libsystemd-internal.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2394,6 +2298,7 @@ systemd_ac_power_SOURCES = \
 
 systemd_ac_power_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2665,8 +2570,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)
 
@@ -2818,8 +2723,8 @@ systemd_nspawn_CFLAGS = \
 
 systemd_nspawn_LDADD = \
        libsystemd-label.la \
-       libsystemd-internal.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la \
        $(BLKID_LIBS)
 
@@ -2829,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
@@ -2903,9 +2803,6 @@ EXTRA_DIST += \
        units/systemd-bus-proxyd.service.m4.in \
        units/user/systemd-bus-proxyd.service.in
 
-CLEANFILES += \
-       units/systemd-bus-proxyd.service.m4
-
 if HAVE_SMACK
 bus-proxyd-set-cap-hook:
        -$(SETCAP) cap_mac_admin+ei $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd
@@ -2936,6 +2833,7 @@ libsystemd_internal_la_SOURCES = \
        src/systemd/sd-path.h \
        src/systemd/sd-network.h \
        src/systemd/sd-hwdb.h \
+       src/systemd/sd-device.h \
        src/libsystemd/sd-bus/sd-bus.c \
        src/libsystemd/sd-bus/bus-control.c \
        src/libsystemd/sd-bus/bus-control.h \
@@ -2999,7 +2897,12 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-network/network-util.c \
        src/libsystemd/sd-hwdb/sd-hwdb.c \
        src/libsystemd/sd-hwdb/hwdb-util.h \
-       src/libsystemd/sd-hwdb/hwdb-internal.h
+       src/libsystemd/sd-hwdb/hwdb-intenal.h \
+       src/libsystemd/sd-device/device-internal.h \
+       src/libsystemd/sd-device/device-util.h \
+       src/libsystemd/sd-device/sd-device.c \
+       src/libsystemd/sd-device/device-private.c \
+       src/libsystemd/sd-device/device-private.h
 
 nodist_libsystemd_internal_la_SOURCES = \
        src/libsystemd/libsystemd.sym
@@ -3039,9 +2942,6 @@ EXTRA_DIST += \
        src/libsystemd/sd-bus/DIFFERENCES \
        src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 
-CLEANFILES += \
-       src/libsystemd/libsystemd.sym
-
 BUILT_SOURCES += \
        src/libsystemd/libsystemd.sym
 
@@ -3615,12 +3515,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 += \
@@ -3632,10 +3526,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 \
@@ -3660,19 +3556,6 @@ pkgconfiglib_DATA += \
 EXTRA_DIST += \
        src/libudev/libudev.pc.in
 
-CLEANFILES += \
-       src/libudev/libudev.pc \
-       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)
@@ -3688,8 +3571,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) \
@@ -3707,21 +3589,20 @@ dist_network_DATA = \
 dist_udevrules_DATA += \
        rules/42-usb-hid-pm.rules \
        rules/50-udev-default.rules \
+       rules/60-block.rules \
        rules/60-drm.rules \
        rules/60-keyboard.rules \
        rules/60-persistent-storage-tape.rules \
-       rules/60-persistent-serial.rules \
        rules/60-persistent-input.rules \
        rules/60-persistent-alsa.rules \
        rules/60-persistent-storage.rules \
+       rules/60-serial.rules \
        rules/64-btrfs.rules \
        rules/70-mouse.rules \
        rules/70-touchpad.rules \
        rules/75-net-description.rules \
-       rules/75-tty-description.rules \
        rules/78-sound-card.rules \
-       rules/80-net-setup-link.rules \
-       rules/95-udev-late.rules
+       rules/80-net-setup-link.rules
 
 nodist_udevrules_DATA += \
        rules/99-systemd.rules
@@ -3738,20 +3619,11 @@ EXTRA_DIST += \
        rules/99-systemd.rules.in \
        src/udev/udev.pc.in
 
-CLEANFILES += \
-       rules/99-systemd.rules \
-       src/udev/udev.pc
-
 EXTRA_DIST += \
        units/systemd-udevd.service.in \
        units/systemd-udev-trigger.service.in \
        units/systemd-udev-settle.service.in
 
-CLEANFILES += \
-       units/systemd-udevd.service \
-       units/systemd-udev-trigger.service \
-       units/systemd-udev-settle.service
-
 SOCKETS_TARGET_WANTS += \
        systemd-udevd-control.socket \
        systemd-udevd-kernel.socket
@@ -3769,19 +3641,22 @@ rootlibexec_PROGRAMS += \
 noinst_LTLIBRARIES += \
        libudev-core.la
 
-src/udev/keyboard-keys.txt:
+src/udev/keyboard-keys-list.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
-src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys.txt
+src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@
 
 src/udev/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf
        $(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@
 
-src/udev/keyboard-keys-to-name.h: src/udev/keyboard-keys.txt
+src/udev/keyboard-keys-to-name.h: src/udev/keyboard-keys-list.txt
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
 
+gperf_txt_sources += \
+       src/udev/keyboard-keys-list.txt
+
 libudev_core_la_SOURCES = \
        src/udev/udev.h \
        src/udev/udev-event.c \
@@ -3808,15 +3683,7 @@ nodist_libudev_core_la_SOURCES = \
        src/udev/keyboard-keys-to-name.h \
        src/udev/net/link-config-gperf.c
 
-BUILT_SOURCES += \
-       $(nodist_libudev_core_la_SOURCES)
-
-CLEANFILES += \
-       src/udev/keyboard-keys-from-name.gperf \
-       src/udev/keyboard-keys.txt \
-       src/udev/net/link-config-gperf.c
-
-EXTRA_DIST += \
+gperf_gperf_sources = \
        src/udev/net/link-config-gperf.gperf
 
 libudev_core_la_CFLAGS = \
@@ -3889,9 +3756,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
@@ -3912,10 +3779,9 @@ dist_udevhwdb_DATA = \
        hwdb/70-touchpad.hwdb
 
 EXTRA_DIST += \
-       units/systemd-hwdb-update.service.in
-
-CLEANFILES += \
-       units/systemd-hwdb-update.service
+       units/systemd-hwdb-update.service.in \
+       hwdb/ids-update.pl \
+       hwdb/sdio.ids
 
 SYSINIT_TARGET_WANTS += \
        systemd-hwdb-update.service
@@ -3942,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 += \
@@ -4002,6 +3863,7 @@ ata_id_SOURCES = \
 
 ata_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4013,6 +3875,7 @@ cdrom_id_SOURCES = \
 
 cdrom_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4027,6 +3890,7 @@ collect_SOURCES = \
 
 collect_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4041,6 +3905,7 @@ scsi_id_SOURCES =\
 
 scsi_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4055,6 +3920,7 @@ v4l_id_SOURCES = \
 
 v4l_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4069,6 +3935,7 @@ accelerometer_SOURCES = \
 
 accelerometer_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4080,8 +3947,6 @@ dist_udevrules_DATA += \
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
 if ENABLE_GTK_DOC
-SUBDIRS += \
-       docs/gudev
 endif
 
 libgudev_includedir = \
@@ -4101,9 +3966,6 @@ lib_LTLIBRARIES += libgudev-1.0.la
 pkgconfiglib_DATA += \
        src/gudev/gudev-1.0.pc
 
-CLEANFILES += \
-       src/gudev/gudev-1.0.pc
-
 libgudev_1_0_la_SOURCES = \
        src/gudev/libgudev-1.0.sym \
        src/gudev/gudevenums.h \
@@ -4343,8 +4205,6 @@ nodist_pkgsysconf_DATA += \
 EXTRA_DIST += \
        src/journal-remote/journal-remote.conf.in
 
-CLEANFILES += \
-       src/journal-remote/journal-remote.conf
 endif
 
 if HAVE_LIBCURL
@@ -4377,9 +4237,6 @@ nodist_pkgsysconf_DATA += \
 
 EXTRA_DIST += \
        src/journal-remote/journal-upload.conf.in
-
-CLEANFILES += \
-       src/journal-remote/journal-upload.conf
 endif
 
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
@@ -4700,11 +4557,10 @@ SYSINIT_TARGET_WANTS += \
 EXTRA_DIST += \
        units/systemd-journald.service.in \
        units/systemd-journal-flush.service.in \
-       units/systemd-journal-catalog-update.service.in \
-       src/journal/journald-gperf.gperf
+       units/systemd-journal-catalog-update.service.in
 
-CLEANFILES += \
-       src/journal/journald-gperf.c
+gperf_gperf_sources += \
+       src/journal/journald-gperf.gperf
 
 # ------------------------------------------------------------------------------
 if HAVE_MICROHTTPD
@@ -4878,17 +4734,14 @@ systemd_vconsole_setup_LDADD = \
 rootlibexec_PROGRAMS += \
        systemd-vconsole-setup
 
-nodist_systemunit_DATA += \
-       units/systemd-vconsole-setup.service
-
 nodist_udevrules_DATA += \
        src/vconsole/90-vconsole.rules
 
+nodist_systemunit_DATA += \
+       units/systemd-vconsole-setup.service
+
 SYSINIT_TARGET_WANTS += \
        systemd-vconsole-setup.service
-
-CLEANFILES += \
-       src/vconsole/90-vconsole.rules
 endif
 
 EXTRA_DIST += \
@@ -4920,9 +4773,6 @@ nodist_systemunit_DATA += \
 
 EXTRA_DIST += \
        units/systemd-bootchart.service.in
-
-CLEANFILES += \
-       units/systemd-bootchart.service
 endif
 
 # ------------------------------------------------------------------------------
@@ -4983,6 +4833,7 @@ systemd_backlight_SOURCES = \
 systemd_backlight_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 endif
 
@@ -5003,6 +4854,7 @@ systemd_rfkill_SOURCES = \
 systemd_rfkill_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 endif
 
@@ -5031,6 +4883,7 @@ systemd_cryptsetup_CFLAGS = \
 systemd_cryptsetup_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la \
        $(LIBCRYPTSETUP_LIBS)
 
@@ -5251,12 +5104,9 @@ systemd_timesyncd_SOURCES = \
 nodist_systemd_timesyncd_SOURCES = \
        src/timesync/timesyncd-gperf.c
 
-EXTRA_DIST += \
+gperf_gperf_sources += \
        src/timesync/timesyncd-gperf.gperf
 
-CLEANFILES += \
-       src/timesync/timesyncd-gperf.c
-
 systemd_timesyncd_LDADD = \
        libsystemd-resolve.la \
        libsystemd-network.la \
@@ -5281,9 +5131,6 @@ nodist_pkgsysconf_DATA += \
 
 EXTRA_DIST += \
        src/timesync/timesyncd.conf.in
-
-CLEANFILES += \
-       src/timesync/timesyncd.conf
 endif
 
 # ------------------------------------------------------------------------------
@@ -5332,8 +5179,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 += \
@@ -5430,14 +5277,18 @@ if HAVE_GCRYPT
 
 rootlibexec_PROGRAMS += \
        systemd-importd \
-       systemd-pull
+       systemd-pull \
+       systemd-import \
+       systemd-export
 
 systemd_importd_SOURCES = \
        src/import/importd.c
 
 systemd_importd_CFLAGS = \
        $(AM_CFLAGS) \
-       -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\"
+       -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" \
+       -D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \
+       -D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\"
 
 systemd_importd_LDADD = \
        libsystemd-internal.la \
@@ -5456,6 +5307,10 @@ systemd_pull_SOURCES = \
        src/import/pull-job.h \
        src/import/pull-common.c \
        src/import/pull-common.h \
+       src/import/import-common.c \
+       src/import/import-common.h \
+       src/import/import-compress.c \
+       src/import/import-compress.h \
        src/import/curl-util.c \
        src/import/curl-util.h \
        src/import/aufs-util.c \
@@ -5482,6 +5337,56 @@ systemd_pull_LDADD = \
        -lbz2 \
        $(GCRYPT_LIBS)
 
+systemd_import_SOURCES = \
+       src/import/import.c \
+       src/import/import-raw.c \
+       src/import/import-raw.h \
+       src/import/import-tar.c \
+       src/import/import-tar.h \
+       src/import/import-common.c \
+       src/import/import-common.h \
+       src/import/import-compress.c \
+       src/import/import-compress.h \
+       src/import/qcow2-util.c \
+       src/import/qcow2-util.h
+
+systemd_import_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(XZ_CFLAGS) \
+       $(ZLIB_CFLAGS)
+
+systemd_import_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       $(XZ_LIBS) \
+       $(ZLIB_LIBS) \
+       -lbz2
+
+systemd_export_SOURCES = \
+       src/import/export.c \
+       src/import/export-tar.c \
+       src/import/export-tar.h \
+       src/import/export-raw.c \
+       src/import/export-raw.h \
+       src/import/import-common.c \
+       src/import/import-common.h \
+       src/import/import-compress.c \
+       src/import/import-compress.h
+
+systemd_export_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(XZ_CFLAGS) \
+       $(ZLIB_CFLAGS)
+
+systemd_export_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       $(XZ_LIBS) \
+       $(ZLIB_LIBS) \
+       -lbz2
+
 dist_rootlibexec_DATA = \
        src/import/import-pubring.gpg
 
@@ -5583,12 +5488,11 @@ systemd_resolved_SOURCES = \
 nodist_systemd_resolved_SOURCES = \
        src/resolve/resolved-gperf.c
 
-EXTRA_DIST += \
-       src/resolve/resolved-gperf.gperf \
-       src/resolve/dns_type-from-name.gperf
+gperf_gperf_sources += \
+       src/resolve/resolved-gperf.gperf
 
-CLEANFILES += \
-       src/resolve/resolved-gperf.c
+gperf_txt_sources += \
+       src/resolve/dns_type-list.txt
 
 systemd_resolved_LDADD = \
        libsystemd-network.la \
@@ -5613,7 +5517,7 @@ dist_dbussystemservice_DATA += \
        src/resolve/org.freedesktop.resolve1.service
 
 EXTRA_DIST += \
-       units/systemd-resolved.service.in
+       units/systemd-resolved.service.m4.in
 
 SYSTEM_UNIT_ALIASES += \
        systemd-resolved.service dbus-org.freedesktop.resolve1.service
@@ -5630,9 +5534,6 @@ nodist_pkgsysconf_DATA += \
 EXTRA_DIST += \
        src/resolve/resolved.conf.in
 
-CLEANFILES += \
-       src/resolve/resolved.conf
-
 tests += \
        test-dns-domain
 
@@ -5706,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
 
@@ -5795,8 +5691,8 @@ networkctl_SOURCES = \
        src/network/networkctl.c
 
 networkctl_LDADD = \
-       libsystemd-internal.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la \
        libsystemd-network.la
 
@@ -5806,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
@@ -5819,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
@@ -5855,15 +5741,14 @@ SYSTEM_UNIT_ALIASES += \
 BUSNAMES_TARGET_WANTS += \
        org.freedesktop.network1.busname
 
-EXTRA_DIST += \
+gperf_gperf_sources += \
        src/network/networkd-network-gperf.gperf \
-       src/network/networkd-netdev-gperf.gperf \
+       src/network/networkd-netdev-gperf.gperf
+
+EXTRA_DIST += \
        units/systemd-networkd.service.in \
        units/systemd-networkd-wait-online.service.in
 
-CLEANFILES += \
-       src/network/networkd-network-gperf.c \
-       src/network/networkd-netdev-gperf.c
 endif
 
 # ------------------------------------------------------------------------------
@@ -5904,8 +5789,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
@@ -5928,10 +5813,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 += \
@@ -6061,17 +5946,15 @@ nodist_udevrules_DATA += \
        src/login/71-seat.rules \
        src/login/73-seat-late.rules
 
-CLEANFILES += \
-       src/login/logind-gperf.c \
-       src/login/71-seat.rules \
-       src/login/73-seat-late.rules
 endif
 
 polkitpolicy_in_files += \
        src/login/org.freedesktop.login1.policy.in
 
+gperf_gperf_sources += \
+       src/login/logind-gperf.gperf
+
 EXTRA_DIST += \
-       src/login/logind-gperf.gperf \
        src/login/71-seat.rules.in \
        src/login/73-seat-late.rules.in \
        units/systemd-logind.service.in
@@ -6226,7 +6109,7 @@ src/python-systemd/id128-constants.h: src/systemd/sd-messages.h
        $(AM_V_GEN)$(SED) -n -r 's/,//g; s/#define (SD_MESSAGE_[A-Z0-9_]+)\s.*/add_id(m, "\1", \1) JOINER/p' <$< >$@
 
 BUILT_SOURCES += \
-       src/python-systemd/id128-constants.h
+       $(nodist_id128_la_SOURCES)
 
 SPHINXOPTS = -D version=$(VERSION) -D release=$(VERSION)
 sphinx-%:
@@ -6511,12 +6394,6 @@ EXTRA_DIST += \
        $(polkitpolicy_in_files) \
        $(polkitpolicy_in_in_files)
 
-CLEANFILES += \
-       $(nodist_systemunit_DATA) \
-       $(nodist_userunit_DATA) \
-       $(pkgconfiglib_DATA) \
-       $(nodist_polkitpolicy_DATA)
-
 # ------------------------------------------------------------------------------
 if ENABLE_MANPAGES
 man/custom-entities.ent: configure.ac
@@ -6573,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
@@ -6599,20 +6458,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
 
@@ -6634,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 \
@@ -6671,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 \
@@ -6728,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 += \