`git diff`-guided cleanup

9 files changed, 29 insertions, 85 deletions

diff --git a/discard.mk b/discard.mk
index e2b5c90471..8e70312498 100644
--- a/discard.mk
+++ b/discard.mk
@@ -519,58 +519,6 @@ EXTRA_DIST += \
 
 @INTLTOOL_POLICY_RULE@
 
-# ------------------------------------------------------------------------------
-
-include Makefile-man.am
-
-.PHONY: man update-man-list
-man: $(MANPAGES) $(MANPAGES_ALIAS) $(HTML_FILES) $(HTML_ALIAS)
-
-CLEANFILES += \
-	$(man_MANS) \
-	$(HTML_FILES) \
-	$(HTML_ALIAS) \
-	docs/html/man
-
-$(outdir)/man:
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_LN)$(LN_S) -f ../../man $@
-
-$(outdir)/index.html: man/systemd.index.html
-	$(AM_V_LN)$(LN_S) -f systemd.index.html $@
-
-ifneq ($(HAVE_PYTHON),)
-noinst_DATA += \
-	man/index.html
-endif # HAVE_PYTHON
-
-CLEANFILES += \
-	man/index.html
-
-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
-NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
-SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))}
-
-$(outdir)/systemd.index.xml: $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FILES)
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
-
-$(outdir)/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py man/custom-entities.ent $(SOURCE_XML_FILES)
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(PYTHON) $< $@ $(SOURCE_XML_FILES)
-
-CLEANFILES += \
-	man/systemd.index.xml \
-	man/systemd.directives.xml
-
-EXTRA_DIST += \
-	$(filter-out man/systemd.directives.xml man/systemd.index.xml,$(XML_FILES)) \
-	tools/make-man-index.py \
-	tools/make-man-rules.py \
-	tools/make-directive-index.py \
-	tools/xml_helper.py \
-	man/glib-event-glue.c
-
 ifneq ($(ENABLE_LDCONFIG),)
 dist_systemunit_DATA += \
 	units/ldconfig.service
@@ -645,6 +593,10 @@ lcov-run lcov-report:
 	echo "Need to reconfigure with --enable-coverage"
 endif # ENABLE_COVERAGE
 
+ifneq ($(HAVE_REMOTE),)
+nodist_sysusers_DATA += \
+	sysusers.d/systemd-remote.conf
+endif # HAVE_REMOTE
 dist_factory_etc_DATA = \
 	factory/etc/nsswitch.conf
 
@@ -743,6 +695,13 @@ test_nss_LDADD = \
 manual_tests += \
 	test-nss
 
+endif # HAVE_GCRYPT
+endif # HAVE_BZIP2
+endif # HAVE_ZLIB
+endif # HAVE_XZ
+endif # HAVE_LIBCURL
+
+endif # ENABLE_IMPORTD
 EXTRA_DIST += \
 	test/Makefile \
 	test/README.testsuite \
@@ -840,7 +799,6 @@ EXTRA_DIST += \
 	$(polkitpolicy_in_files) \
 	$(polkitpolicy_in_in_files)
 
-# ------------------------------------------------------------------------------
 CLEANFILES += \
 	man/custom-entities.ent
 
@@ -1051,4 +1009,5 @@ tests += \
 	test-libsystemd-sym \
 	test-libudev-sym
 
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-resolve/systemd-resolve/Makefile b/src/grp-resolve/systemd-resolve/Makefile
index 2f1ad43208..ef8b1785dc 100644
--- a/src/grp-resolve/systemd-resolve/Makefile
+++ b/src/grp-resolve/systemd-resolve/Makefile
@@ -39,6 +39,7 @@ systemd_resolve_CFLAGS = \
 systemd_resolve_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-gcrypt.la \
+	libbasic-dns.la \
 	libsystemd-shared.la \
 	$(GCRYPT_LIBS) \
 	-lm
@@ -52,6 +53,4 @@ dist_bashcompletion_data += \
 dist_zshcompletion_data += \
 	shell-completion/zsh/_systemd-resolve
 
-systemd_resolve_LDADD += libbasic-dns.la
-
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile
index 768c30bf97..f1cd91483e 100644
--- a/src/grp-resolve/systemd-resolved/Makefile
+++ b/src/grp-resolve/systemd-resolved/Makefile
@@ -79,6 +79,7 @@ systemd_resolved_CFLAGS = \
 	$(GCRYPT_CFLAGS)
 
 systemd_resolved_LDADD = \
+	libbasic-dns.la \
 	libsystemd-internal.la \
 	libsystemd-network.la \
 	libsystemd-shared.la \
@@ -112,9 +113,6 @@ GENERAL_ALIASES += \
 nodist_pkgsysconf_DATA += \
 	src/resolve/resolved.conf
 
-gperf_txt_sources += \
-	src/resolve/dns_type-list.txt
-
 gperf_gperf_sources += \
 	src/resolve/resolved-gperf.gperf
 
@@ -125,8 +123,6 @@ EXTRA_DIST += \
 dist_rootlibexec_DATA += \
 	src/resolve/resolv.conf
 
-systemd_resolved_LDADD += libbasic-dns.la
-
 sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/Makefile b/src/grp-udev/Makefile
index e826b46a5c..ac635bfdba 100644
--- a/src/grp-udev/Makefile
+++ b/src/grp-udev/Makefile
@@ -43,11 +43,6 @@ dist_udevrules_DATA += \
 	rules/78-sound-card.rules \
 	rules/80-net-setup-link.rules
 
-ifneq ($(HAVE_KMOD),)
-dist_udevrules_DATA += \
-	rules/80-drivers.rules
-endif # HAVE_KMOD
-
 nodist_udevrules_DATA += \
 	rules/99-systemd.rules
 
@@ -75,6 +70,11 @@ SYSINIT_TARGET_WANTS += \
 	systemd-udevd.service \
 	systemd-udev-trigger.service
 
+ifneq ($(HAVE_KMOD),)
+dist_udevrules_DATA += \
+	rules/80-drivers.rules
+endif # HAVE_KMOD
+
 nested.subdirs += ata_id
 nested.subdirs += cdrom_id
 nested.subdirs += collect
diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile
index 01115354c7..54a61b24ce 100644
--- a/src/grp-udev/libudev-core/Makefile
+++ b/src/grp-udev/libudev-core/Makefile
@@ -26,7 +26,7 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
 noinst_LTLIBRARIES += \
 	libudev-core.la
 
-$(outdir)/keyboard-keys-list.txt:
+$(outdir)/keyboard-keys-list.txt: | $(outdir)/$(DEPDIR)
 	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@
 
 $(outdir)/keyboard-keys-from-name.gperf: $(outdir)/keyboard-keys-list.txt
@@ -73,9 +73,9 @@ libudev_core_la_CFLAGS = \
 libudev_core_la_LIBADD = \
 	libsystemd-internal.la \
 	libsystemd-basic.la \
-	libsystemd-shared.la \
-	libsystemd-network.la \
 	libsystemd-staging.la \
+	libsystemd-network.la \
+	libsystemd-shared.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
 
diff --git a/src/grp-udev/libudev-core/net/Makefile b/src/grp-udev/libudev-core/net/Makefile
index 5094fa6050..afe70e8a3d 100644
--- a/src/grp-udev/libudev-core/net/Makefile
+++ b/src/grp-udev/libudev-core/net/Makefile
@@ -20,7 +20,6 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
diff --git a/src/libsystemd-basic/src/Makefile b/src/libsystemd-basic/src/Makefile
index 3c9f3246af..fd72f23308 100644
--- a/src/libsystemd-basic/src/Makefile
+++ b/src/libsystemd-basic/src/Makefile
@@ -238,19 +238,19 @@ libsystemd_basic_la_LIBADD = \
 	-lrt \
 	-lm
 
-$(outdir)/errno-list.txt: | $(outdir)/.deps
+$(outdir)/errno-list.txt: | $(outdir)/$(DEPDIR)
 	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
 
 $(outdir)/errno-to-name.h: $(outdir)/errno-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
 
-$(outdir)/af-list.txt: | $(outdir)/.deps
+$(outdir)/af-list.txt: | $(outdir)/$(DEPDIR)
 	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@
 
 $(outdir)/af-to-name.h: $(outdir)/af-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
 
-$(outdir)/arphrd-list.txt: | $(outdir)/.deps
+$(outdir)/arphrd-list.txt: | $(outdir)/$(DEPDIR)
 	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
 
 $(outdir)/arphrd-to-name.h: $(outdir)/arphrd-list.txt
@@ -259,7 +259,7 @@ $(outdir)/arphrd-to-name.h: $(outdir)/arphrd-list.txt
 $(outdir)/arphrd-from-name.gperf: $(outdir)/arphrd-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
 
-$(outdir)/cap-list.txt: | $(outdir)/.deps
+$(outdir)/cap-list.txt: | $(outdir)/$(DEPDIR)
 	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include linux/capability.h -include systemd-basic/missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
 
 $(outdir)/cap-to-name.h: $(outdir)/cap-list.txt
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
index b8b8e01968..e780b351c5 100644
--- a/src/libsystemd/Makefile
+++ b/src/libsystemd/Makefile
@@ -32,16 +32,7 @@ EXTRA_DIST += \
 	src/libsystemd/sd-bus/DIFFERENCES \
 	src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 
-#libsystemd_la_SOURCES = \
-	$(libsystemd_internal_la_SOURCES) \
-	$(libsystemd_journal_internal_la_SOURCES)
-
-#nodist_libsystemd_la_SOURCES = \
-	$(nodist_libsystemd_internal_la_SOURCES)
-
-#libsystemd_la_CFLAGS = \
-	$(libsystemd_internal_la_CFLAGS) \
-	$(libsystemd_journal_internal_la_CFLAGS)
+libsystemd_la_SOURCES =
 
 libsystemd_la_LDFLAGS = \
 	-version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
diff --git a/src/libsystemd/src/sd-journal/Makefile b/src/libsystemd/src/sd-journal/Makefile
index 38a3458f4b..10cd8c45bb 100644
--- a/src/libsystemd/src/sd-journal/Makefile
+++ b/src/libsystemd/src/sd-journal/Makefile
@@ -23,12 +23,12 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-audit_list_includes = -include linux/audit.h -include $(topsrcdir)/src/libsystemd-basic/include/systemd-basic/missing.h
+audit_list_includes = -include linux/audit.h -include systemd-basic/missing.h
 ifneq ($(HAVE_AUDIT),)
 audit_list_includes += -include libaudit.h
 endif # HAVE_AUDIT
 
-$(outdir)/audit_type-list.txt: $(call at.path,$(topsrcdir)/src/libsystemd-basic/include/systemd-basic/missing.h)
+$(outdir)/audit_type-list.txt: | $(outdir)/$(DEPDIR)
 	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM $(audit_list_includes) - </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 >$@
 
 $(outdir)/audit_type-to-name.h: $(outdir)/audit_type-list.txt