]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - Makefile.am
journal: add int↔audit type name mapping
[thirdparty/systemd.git] / Makefile.am
index 503a4716de1f3684eaab0af95f3d8fc427ebd464..c854b63a8eaf1772664449de57c95d6432a5702d 100644 (file)
@@ -74,6 +74,7 @@ dbussessionservicedir=@dbussessionservicedir@
 dbussystemservicedir=@dbussystemservicedir@
 pamlibdir=@pamlibdir@
 pamconfdir=@pamconfdir@
+pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=@bashcompletiondir@
@@ -109,8 +110,8 @@ udevrulesdir=$(udevlibexecdir)/rules.d
 udevhwdbdir=$(udevlibexecdir)/hwdb.d
 catalogdir=$(prefix)/lib/systemd/catalog
 kernelinstalldir = $(prefix)/lib/kernel/install.d
-factory_etcdir = $(prefix)/share/factory/etc
-factory_pamdir = $(prefix)/share/factory/etc/pam.d
+factory_etcdir = $(datadir)/factory/etc
+factory_pamdir = $(datadir)/factory/etc/pam.d
 bootlibdir = $(prefix)/lib/systemd/boot/efi
 
 # And these are the special ones for /
@@ -118,8 +119,6 @@ rootprefix=@rootprefix@
 rootbindir=$(rootprefix)/bin
 rootlibexecdir=$(rootprefix)/lib/systemd
 
-CLEANFILES = $(BUILT_SOURCES)
-DISTCLEANFILES =
 EXTRA_DIST =
 BUILT_SOURCES =
 INSTALL_EXEC_HOOKS =
@@ -133,6 +132,7 @@ noinst_LTLIBRARIES =
 lib_LTLIBRARIES =
 include_HEADERS =
 noinst_DATA =
+pkgconfigdata_DATA =
 pkgconfiglib_DATA =
 polkitpolicy_in_in_files =
 polkitpolicy_in_files =
@@ -161,6 +161,16 @@ 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) \
+       $(pkgconfigdata_DATA) \
+       $(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)
@@ -208,6 +218,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/network \
        -I $(top_srcdir)/src/login \
        -I $(top_srcdir)/src/journal \
+       -I $(top_builddir)/src/journal \
        -I $(top_srcdir)/src/timedate \
        -I $(top_srcdir)/src/timesync \
        -I $(top_srcdir)/src/resolve \
@@ -224,6 +235,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)
@@ -610,12 +622,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 \
@@ -646,7 +652,6 @@ dist_doc_DATA = \
        NEWS \
        LICENSE.LGPL2.1 \
        LICENSE.GPL2 \
-       LICENSE.MIT \
        DISTRO_PORTING \
        src/libsystemd/sd-bus/PORTING-DBUS1 \
        src/libsystemd/sd-bus/DIFFERENCES \
@@ -775,6 +780,7 @@ libsystemd_shared_la_SOURCES = \
        src/shared/architecture.h \
        src/shared/efivars.c \
        src/shared/efivars.h \
+       src/shared/formats-util.h \
        src/shared/fstab-util.c \
        src/shared/fstab-util.h \
        src/shared/path-util.c \
@@ -790,6 +796,7 @@ libsystemd_shared_la_SOURCES = \
        src/shared/siphash24.c \
        src/shared/siphash24.h \
        src/shared/set.h \
+       src/shared/ordered-set.h \
        src/shared/fdset.c \
        src/shared/fdset.h \
        src/shared/prioq.c \
@@ -842,8 +849,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 \
@@ -898,6 +903,12 @@ libsystemd_shared_la_SOURCES = \
        src/shared/base-filesystem.h \
        src/shared/memfd-util.c \
        src/shared/memfd-util.h \
+       src/shared/process-util.c \
+       src/shared/process-util.h \
+       src/shared/random-util.c \
+       src/shared/random-util.h \
+       src/shared/terminal-util.c \
+       src/shared/terminal-util.h \
        src/shared/uid-range.c \
        src/shared/uid-range.h \
        src/shared/nss-util.h \
@@ -907,7 +918,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/sigbus.h \
        src/shared/build.h \
        src/shared/import-util.c \
-       src/shared/import-util.h
+       src/shared/import-util.h \
+       src/shared/sysctl-util.c \
+       src/shared/sysctl-util.h
 
 if HAVE_UTMP
 libsystemd_shared_la_SOURCES += \
@@ -976,6 +989,8 @@ libsystemd_label_la_SOURCES = \
        src/shared/btrfs-util.c \
        src/shared/btrfs-util.h \
        src/shared/btrfs-ctree.h \
+       src/shared/rm-rf.c \
+       src/shared/rm-rf.h \
        src/shared/machine-image.c \
        src/shared/machine-image.h \
        src/shared/machine-pool.c \
@@ -1223,35 +1238,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 }' <$< >$@
@@ -1300,13 +1314,25 @@ src/shared/cap-from-name.gperf: src/shared/cap-list.txt
 src/shared/cap-from-name.h: src/shared/cap-from-name.gperf
        $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
 
+audit_list_includes = -include linux/audit.h missing.h
+if HAVE_AUDIT
+audit_list_includes += -include libaudit.h
+endif
+
+src/journal/audit_type-list.txt:
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/audit.h -include missing.h - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@
+
+src/journal/audit_type-to-name.h: src/journal/audit_type-list.txt
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf "        case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print "        default: return NULL;\n\t}\n}\n" }' <$< >$@
+
 
 src/resolve/dns_type-list.txt: src/resolve/dns-type.h
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(SED) -n -r 's/.* DNS_TYPE_(\w+).*/\1/p' <$< >$@
 
 src/resolve/dns_type-to-name.h: src/resolve/dns_type-list.txt
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" } {printf "        case DNS_TYPE_%s: return ", $$1; sub(/_/, "-"); printf "\"%s\";\n", $$1 } END{ print "\ndefault: return NULL;\n\t}\n}\n" }' <$< >$@
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" } {printf "        case DNS_TYPE_%s: return ", $$1; sub(/_/, "-"); printf "\"%s\";\n", $$1 } END{ print "        default: return NULL;\n\t}\n}\n" }' <$< >$@
 
 src/resolve/dns_type-from-name.gperf: src/resolve/dns_type-list.txt
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct dns_type_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { s=$$1; sub(/_/, "-", s); printf "%s, ", $$s; printf "DNS_TYPE_%s\n", $$1 }' <$< >$@
@@ -1336,7 +1362,7 @@ dist_dbussystemservice_DATA += \
 polkitpolicy_in_in_files += \
        src/core/org.freedesktop.systemd1.policy.in.in
 
-pkgconfiglib_DATA += \
+pkgconfigdata_DATA += \
        src/core/systemd.pc
 
 nodist_rpmmacros_DATA = \
@@ -1346,10 +1372,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 += \
@@ -1389,6 +1411,8 @@ tests += \
        test-utf8 \
        test-ellipsize \
        test-util \
+       test-process-util \
+       test-terminal-util \
        test-path-lookup \
        test-ring \
        test-barrier \
@@ -1661,6 +1685,19 @@ test_util_SOURCES = \
        src/test/test-util.c
 
 test_util_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
+test_process_util_SOURCES = \
+       src/test/test-process-util.c
+
+test_process_util_LDADD = \
+       libsystemd-shared.la
+
+test_terminal_util_SOURCES = \
+       src/test/test-terminal-util.c
+
+test_terminal_util_LDADD = \
        libsystemd-shared.la
 
 test_path_lookup_SOURCES = \
@@ -1669,6 +1706,7 @@ test_path_lookup_SOURCES = \
 test_path_lookup_LDADD = \
        -lm \
        libsystemd-units.la \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 test_uid_range_SOURCES = \
@@ -1725,9 +1763,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
 
@@ -1971,6 +2006,7 @@ test_path_util_SOURCES = \
        src/test/test-path-util.c
 
 test_path_util_LDADD = \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 test_path_SOURCES = \
@@ -2030,6 +2066,7 @@ test_conf_files_SOURCES = \
        src/test/test-conf-files.c
 
 test_conf_files_LDADD = \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 test_bus_policy_SOURCES = \
@@ -2150,6 +2187,7 @@ systemd_shutdown_SOURCES = \
 systemd_shutdown_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2222,7 +2260,8 @@ dist_tmpfiles_DATA = \
        tmpfiles.d/systemd-nologin.conf \
        tmpfiles.d/tmp.conf \
        tmpfiles.d/x11.conf \
-       tmpfiles.d/var.conf
+       tmpfiles.d/var.conf \
+       tmpfiles.d/home.conf
 
 if HAVE_SYSV_COMPAT
 dist_tmpfiles_DATA += \
@@ -2251,10 +2290,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 +2319,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,11 +2390,13 @@ systemd_fsck_SOURCES = \
 systemd_fsck_LDADD = \
        libsystemd-internal.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_fsckd_SOURCES = \
        src/fsckd/fsckd.c \
+       src/fsckd/fsckd.h \
        $(NULL)
 
 systemd_fsckd_LDADD = \
@@ -2393,6 +2426,7 @@ systemd_ac_power_SOURCES = \
 
 systemd_ac_power_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2509,6 +2543,7 @@ bootctl_CFLAGS = \
        $(BLKID_CFLAGS)
 
 bootctl_LDADD = \
+       libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-internal.la \
        $(BLKID_LIBS)
@@ -2546,17 +2581,23 @@ efi_cflags = \
        -fno-strict-aliasing \
        -fno-stack-protector \
        -Wsign-compare \
-       -Wno-missing-field-initializers \
-       -mno-sse \
-       -mno-mmx
+       -Wno-missing-field-initializers
 
 if ARCH_X86_64
 efi_cflags += \
        -mno-red-zone \
+       -mno-sse \
+       -mno-mmx \
        -DEFI_FUNCTION_WRAPPER \
        -DGNU_EFI_USE_MS_ABI
 endif
 
+if ARCH_IA32
+efi_cflags += \
+       -mno-sse \
+       -mno-mmx
+endif
+
 efi_ldflags = \
        $(EFI_LDFLAGS) \
        -T $(EFI_LDS_DIR)/elf_$(EFI_ARCH)_efi.lds \
@@ -2567,6 +2608,15 @@ efi_ldflags = \
        -L $(EFI_LIB_DIR) \
        $(EFI_LDS_DIR)/crt0-efi-$(EFI_ARCH).o
 
+# Aarch64 and ARM32 don't have an EFI capable objcopy. Use 'binary' instead,
+# and add required symbols manually.
+if ARCH_AARCH64
+efi_ldflags += --defsym=EFI_SUBSYSTEM=0xa
+EFI_FORMAT = -O binary
+else
+EFI_FORMAT = --target=efi-app-$(EFI_ARCH)
+endif
+
 # ------------------------------------------------------------------------------
 systemd_boot_headers = \
        src/boot/efi/util.h \
@@ -2599,9 +2649,8 @@ $(systemd_boot_solib): $(systemd_boot_objects)
        nm -D -u $@ | grep ' U ' && exit 1 || :
 
 $(systemd_boot): $(systemd_boot_solib)
-       $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \
-         -j .dynsym -j .rel -j .rela -j .reloc \
-         --target=efi-app-$(EFI_ARCH) $< $@
+       $(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
+         -j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
 
 # ------------------------------------------------------------------------------
 stub_headers = \
@@ -2637,9 +2686,8 @@ $(stub_solib): $(stub_objects)
        nm -D -u $@ | grep ' U ' && exit 1 || :
 
 $(stub): $(stub_solib)
-       $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \
-         -j .dynsym -j .rel -j .rela -j .reloc \
-         --target=efi-app-$(EFI_ARCH) $< $@
+       $(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
+         -j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
 
 # ------------------------------------------------------------------------------
 CLEANFILES += test-efi-disk.img
@@ -2664,8 +2712,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)
 
@@ -2817,8 +2865,8 @@ systemd_nspawn_CFLAGS = \
 
 systemd_nspawn_LDADD = \
        libsystemd-label.la \
-       libsystemd-internal.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la \
        $(BLKID_LIBS)
 
@@ -2902,9 +2950,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
@@ -2935,6 +2980,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 \
@@ -2998,7 +3044,14 @@ 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-internal.h \
+       src/libsystemd/sd-device/device-internal.h \
+       src/libsystemd/sd-device/device-util.h \
+       src/libsystemd/sd-device/device-enumerator.c \
+       src/libsystemd/sd-device/device-enumerator-private.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
@@ -3038,9 +3091,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
 
@@ -3631,10 +3681,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,7 +3712,6 @@ EXTRA_DIST += \
        src/libudev/libudev.pc.in
 
 CLEANFILES += \
-       src/libudev/libudev.pc \
        docs/html/libudev \
        docs/html/gudev
 
@@ -3687,8 +3738,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) \
@@ -3706,21 +3756,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-evdev.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
@@ -3729,28 +3778,18 @@ udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = \
        src/udev/udev.conf
 
-sharepkgconfigdir = $(datadir)/pkgconfig
-sharepkgconfig_DATA = \
+pkgconfigdata_DATA += \
        src/udev/udev.pc
 
 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
@@ -3768,19 +3807,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 \
@@ -3807,15 +3849,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 = \
@@ -3888,9 +3922,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
@@ -3906,15 +3940,15 @@ dist_udevhwdb_DATA = \
        hwdb/20-acpi-vendor.hwdb \
        hwdb/20-OUI.hwdb \
        hwdb/20-net-ifname.hwdb \
+       hwdb/60-evdev.hwdb \
        hwdb/60-keyboard.hwdb \
        hwdb/70-mouse.hwdb \
        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
@@ -3939,9 +3973,14 @@ TESTS += \
 if HAVE_PYTHON
 TESTS += \
        test/rule-syntax-check.py \
+       $(NULL)
+
+if HAVE_SYSV_COMPAT
+TESTS += \
        test/sysv-generator-test.py \
        $(NULL)
 endif
+endif
 
 manual_tests += \
        test-libudev \
@@ -3953,8 +3992,8 @@ test_libudev_SOURCES = \
 test_libudev_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
 test_udev_SOURCES = \
        src/test/test-udev.c
@@ -3996,6 +4035,7 @@ ata_id_SOURCES = \
 
 ata_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4007,6 +4047,7 @@ cdrom_id_SOURCES = \
 
 cdrom_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4021,6 +4062,7 @@ collect_SOURCES = \
 
 collect_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4035,6 +4077,7 @@ scsi_id_SOURCES =\
 
 scsi_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4049,6 +4092,7 @@ v4l_id_SOURCES = \
 
 v4l_id_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4063,6 +4107,7 @@ accelerometer_SOURCES = \
 
 accelerometer_LDADD = \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -4095,9 +4140,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 \
@@ -4337,8 +4379,6 @@ nodist_pkgsysconf_DATA += \
 EXTRA_DIST += \
        src/journal-remote/journal-remote.conf.in
 
-CLEANFILES += \
-       src/journal-remote/journal-remote.conf
 endif
 
 if HAVE_LIBCURL
@@ -4371,9 +4411,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
@@ -4610,7 +4647,13 @@ libsystemd_journal_internal_la_SOURCES = \
        src/journal/catalog.h \
        src/journal/mmap-cache.c \
        src/journal/mmap-cache.h \
-       src/journal/compress.c
+       src/journal/compress.c \
+       src/journal/audit-type.h \
+       src/journal/audit-type.c \
+       src/journal/audit_type-to-name.h
+
+gperf_txt_sources += \
+       src/journal/audit_type-list.txt
 
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 libsystemd_journal_internal_la_CFLAGS = \
@@ -4694,11 +4737,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
@@ -4872,17 +4914,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 += \
@@ -4914,9 +4953,6 @@ nodist_systemunit_DATA += \
 
 EXTRA_DIST += \
        units/systemd-bootchart.service.in
-
-CLEANFILES += \
-       units/systemd-bootchart.service
 endif
 
 # ------------------------------------------------------------------------------
@@ -4977,6 +5013,7 @@ systemd_backlight_SOURCES = \
 systemd_backlight_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 endif
 
@@ -4997,6 +5034,7 @@ systemd_rfkill_SOURCES = \
 systemd_rfkill_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la
 endif
 
@@ -5025,6 +5063,7 @@ systemd_cryptsetup_CFLAGS = \
 systemd_cryptsetup_LDADD = \
        libsystemd-label.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la \
        $(LIBCRYPTSETUP_LIBS)
 
@@ -5245,12 +5284,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 \
@@ -5275,9 +5311,6 @@ nodist_pkgsysconf_DATA += \
 
 EXTRA_DIST += \
        src/timesync/timesyncd.conf.in
-
-CLEANFILES += \
-       src/timesync/timesyncd.conf
 endif
 
 # ------------------------------------------------------------------------------
@@ -5326,8 +5359,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 += \
@@ -5424,14 +5457,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 \
@@ -5440,16 +5477,20 @@ systemd_importd_LDADD = \
 
 systemd_pull_SOURCES = \
        src/import/pull.c \
-       src/import/import-raw.c \
-       src/import/import-raw.h \
-       src/import/import-tar.c \
-       src/import/import-tar.h \
-       src/import/import-dkr.c \
-       src/import/import-dkr.h \
-       src/import/import-job.c \
-       src/import/import-job.h \
+       src/import/pull-raw.c \
+       src/import/pull-raw.h \
+       src/import/pull-tar.c \
+       src/import/pull-tar.h \
+       src/import/pull-dkr.c \
+       src/import/pull-dkr.h \
+       src/import/pull-job.c \
+       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 \
@@ -5467,8 +5508,8 @@ systemd_pull_CFLAGS = \
        -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
 
 systemd_pull_LDADD = \
-       libsystemd-internal.la \
        libsystemd-label.la \
+       libsystemd-internal.la \
        libsystemd-shared.la \
        $(LIBCURL_LIBS) \
        $(XZ_LIBS) \
@@ -5476,6 +5517,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-label.la \
+       libsystemd-internal.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-label.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la \
+       $(XZ_LIBS) \
+       $(ZLIB_LIBS) \
+       -lbz2
+
 dist_rootlibexec_DATA = \
        src/import/import-pubring.gpg
 
@@ -5577,12 +5668,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 \
@@ -5607,7 +5697,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
@@ -5624,9 +5714,6 @@ nodist_pkgsysconf_DATA += \
 EXTRA_DIST += \
        src/resolve/resolved.conf.in
 
-CLEANFILES += \
-       src/resolve/resolved.conf
-
 tests += \
        test-dns-domain
 
@@ -5789,8 +5876,8 @@ networkctl_SOURCES = \
        src/network/networkctl.c
 
 networkctl_LDADD = \
-       libsystemd-internal.la \
        libudev-internal.la \
+       libsystemd-internal.la \
        libsystemd-shared.la \
        libsystemd-network.la
 
@@ -5849,15 +5936,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
 
 # ------------------------------------------------------------------------------
@@ -5898,8 +5984,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
@@ -5922,10 +6008,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 += \
@@ -6055,17 +6141,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
@@ -6220,7 +6304,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-%:
@@ -6505,12 +6589,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