diff options
32 files changed, 398 insertions, 719 deletions
@@ -44,7 +44,6 @@ files.src.gen += config.h.in files.src.gen += configure nested.subdirs += man -nested.subdirs += src nested.subdirs += test include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/Makefile.am b/Makefile.am index 996ecdcfcc..f79c43d21c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -739,9 +739,8 @@ EXTRA_DIST += \ @INTLTOOL_POLICY_RULE@ -# ------------------------------------------------------------------------------ +#@build-aux/Makefile.each.tail/70-man.mk --------------------------------------- -#@build-aux/Makefile.each.tail/70-sd.mk MANPAGES = MANPAGES_ALIAS = @@ -768,7 +767,6 @@ noinst_DATA += \ docs/html/man endif # ENABLE_MANPAGES -#@discard.mk CLEANFILES += \ $(man_MANS) \ $(HTML_FILES) \ @@ -2603,10 +2601,12 @@ nodist_sysusers_DATA = \ sysusers.d/systemd.conf \ sysusers.d/basic.conf +#@discard.mk if HAVE_REMOTE nodist_sysusers_DATA += \ sysusers.d/systemd-remote.conf endif # HAVE_REMOTE +#@auto/systemd-sysusers/Makefile INSTALL_DIRS += \ $(sysusersdir) @@ -4082,6 +4082,7 @@ systemd_journald_LDADD = \ libjournal-core.la \ libshared.la +#@auto/systemd-cat/Makefile systemd_cat_SOURCES = \ src/journal/cat.c @@ -4460,12 +4461,15 @@ noinst_LTLIBRARIES += \ rootlibexec_PROGRAMS += \ systemd-journald +#@auto/journalctl/Makefile rootbin_PROGRAMS += \ journalctl +#@auto/systemd-cat/Makefile bin_PROGRAMS += \ systemd-cat +#@auto/systemd-journald/Makefile dist_systemunit_DATA += \ units/systemd-journald.socket \ units/systemd-journald-dev-log.socket \ @@ -4874,7 +4878,7 @@ dist_systemunit_DATA_busnames += \ BUSNAMES_TARGET_WANTS += \ org.freedesktop.systemd1.busname -#@src/grp-locale/Makefile ------------------------------------------------------ +#@auto/systemd-localed/Makefile ------------------------------------------------ if ENABLE_LOCALED systemd_localed_SOURCES = \ src/locale/localed.c @@ -4915,6 +4919,9 @@ dist_pkgdata_DATA = \ src/locale/kbd-model-map \ src/locale/language-fallback-map +endif # ENABLE_LOCALED +#@auto/localectl/Makefile +if ENABLE_LOCALED localectl_SOURCES = \ src/locale/localectl.c @@ -4930,6 +4937,7 @@ dist_bashcompletion_data += \ dist_zshcompletion_data += \ shell-completion/zsh/_localectl endif # ENABLE_LOCALED +#@auto/systemd-localed/Makefile .PHONY: update-kbd-model-map @@ -5473,7 +5481,7 @@ libnss_resolve_la_LIBADD = \ lib_LTLIBRARIES += \ libnss_resolve.la -#@auto/systemd-resolved/Makefile +#@auto/systemd-resolve/Makefile systemd_resolve_SOURCES = \ src/resolve/resolve-tool.c \ $(basic_dns_sources) \ @@ -5903,7 +5911,7 @@ dist_pamconf_DATA = \ EXTRA_DIST += \ src/login/systemd-user.m4 endif # HAVE_PAM -#@src/grp-login/Makefile +#@auto/systemd-logind/Makefile nodist_systemunit_DATA += \ units/systemd-logind.service @@ -6232,28 +6240,36 @@ EXTRA_DIST += \ man/custom-man.xsl # ------------------------------------------------------------------------------ +#@auto/systemd-sysv-generator/Makefile if HAVE_SYSV_COMPAT sysvinit_DATA = \ docs/sysvinit/README -varlog_DATA = \ - docs/var-log/README - docs/sysvinit/README: docs/sysvinit/README.in $(SED_PROCESS) +CLEANFILES += \ + docs/sysvinit/README +endif # HAVE_SYSV_COMPAT + +EXTRA_DIST += \ + docs/sysvinit/README.in +#@src/grp-journal/Makefile +if HAVE_SYSV_COMPAT + +varlog_DATA = \ + docs/var-log/README + docs/var-log/README: docs/var-log/README.in $(SED_PROCESS) CLEANFILES += \ - docs/sysvinit/README \ docs/var-log/README endif # HAVE_SYSV_COMPAT EXTRA_DIST += \ - docs/sysvinit/README.in \ docs/var-log/README.in - +#@discard.mk SOCKETS_TARGET_WANTS += \ systemd-initctl.socket @@ -6590,8 +6606,6 @@ list-keys: add-key: gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import - #@Makefile -nested.subdirs += src - # intltoolize files.src.gen += m4/intltool.m4 files.src.gen += po/Makefile.in.in @@ -6611,108 +6625,28 @@ files.src.gen += m4/ltversion.m4 files.src.gen += m4/lt~obsolete.m4 files.src.gen += config.h.in files.src.gen += configure - -#@src/Makefile -nested.subdirs += busctl -nested.subdirs += grp-boot -nested.subdirs += grp-coredump -nested.subdirs += grp-hostname -nested.subdirs += grp-initprogs -nested.subdirs += grp-journal -nested.subdirs += grp-locale -nested.subdirs += grp-login -nested.subdirs += grp-machine -nested.subdirs += grp-network -nested.subdirs += grp-resolve -nested.subdirs += grp-system -nested.subdirs += grp-timedate -nested.subdirs += grp-udev -nested.subdirs += grp-utils -nested.subdirs += libbasic -nested.subdirs += libfirewall -nested.subdirs += libshared -nested.subdirs += libsystemd -nested.subdirs += libsystemd-network -nested.subdirs += libudev -nested.subdirs += nss-myhostname -nested.subdirs += systemd-ask-password -nested.subdirs += systemd-cgls -nested.subdirs += systemd-cgroups-agent -nested.subdirs += systemd-cgtop -nested.subdirs += systemd-cryptsetup -nested.subdirs += systemd-dbus1-generator -nested.subdirs += systemd-debug-generator -nested.subdirs += systemd-getty-generator -nested.subdirs += systemd-gpt-auto-generator -nested.subdirs += systemd-initctl -nested.subdirs += systemd-machine-id-setup -nested.subdirs += systemd-nspawn -nested.subdirs += systemd-rc-local-generator -nested.subdirs += systemd-remount-fs -nested.subdirs += systemd-reply-password -nested.subdirs += systemd-socket-proxyd -nested.subdirs += systemd-stdio-bridge -nested.subdirs += systemd-system-update-generator -nested.subdirs += systemd-timesyncd -nested.subdirs += systemd-tty-ask-password-agent - -#@src/grp-initprogs/Makefile -nested.subdirs += grp-sleep -nested.subdirs += systemd-backlight -nested.subdirs += systemd-binfmt -nested.subdirs += systemd-detect-virt -nested.subdirs += systemd-firstboot -nested.subdirs += systemd-fsck -nested.subdirs += systemd-modules-load -nested.subdirs += systemd-quotacheck -nested.subdirs += systemd-random-seed -nested.subdirs += systemd-rfkill -nested.subdirs += systemd-sysctl -nested.subdirs += systemd-sysusers -nested.subdirs += systemd-tmpfiles -nested.subdirs += systemd-update-done -nested.subdirs += systemd-update-utmp -nested.subdirs += systemd-user-sessions -nested.subdirs += systemd-vconsole-setup - -#@src/grp-initprogs/grp-sleep/Makefile -nested.subdirs += systemd-hibernate-resume -nested.subdirs += systemd-hibernate-resume-generator -nested.subdirs += systemd-sleep - -#@src/libudev/Makefile -nested.subdirs += src - #@src/libsystemd/src/subdir.mk -systemd.CPPFLAGS += -DLIBDIR=\"$(libdir)\" -systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" - +sd.CPPFLAGS += -DLIBDIR=\"$(libdir)\" +sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" +#@src/grp-udev/libudev-core/net/Makefile +sd.CPPFLAGS += $(libshared.CPPFLAGS) +sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) +#@src/Makefile #@src/grp-boot/Makefile -nested.subdirs += bootctl systemd-boot kernel-install - #@src/grp-coredump/Makefile -nested.subdirs += coredumpctl systemd-coredump - -#@src/grp-machine/Makefile -nested.subdirs += machinectl systemd-machined -nested.subdirs += nss-mymachines - +#@src/grp-hostname/Makefile +#@src/grp-initprogs/Makefile +#@src/grp-initprogs/grp-sleep/Makefile #@src/grp-journal/grp-remote/Makefile -nested.subdirs += systemd-journa-gatewayd -nested.subdirs += systemd-journa-remote -nested.subdirs += systemd-journa-upload - +#@src/grp-machine/Makefile +#@src/grp-machine/grp-import/Makefile +#@src/grp-machine/grp-import/libimport/Makefile #@src/grp-resolve/Makefile -nested.subdirs += systemd-resolved nss-resolve - +#@src/grp-resolve/libbasic-dns/Makefile #@src/grp-system/Makefile -nested.subdirs += systemctl systemd - #@src/grp-timedate/Makefile -nested.subdirs += timedatectl systemd-timedated - -#@src/grp-hostname/Makefile -nested.subdirs += systemd-hostnamed hostnamectl - +#@src/grp-utils/Makefile +#@src/libudev/Makefile #@all + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/build-aux/Makefile.each.tail/50-sd.mk b/build-aux/Makefile.each.tail/50-sd.mk index 608f9b0e8e..b91e83f486 100644 --- a/build-aux/Makefile.each.tail/50-sd.mk +++ b/build-aux/Makefile.each.tail/50-sd.mk @@ -76,4 +76,5 @@ define generate-sym-test $(AM_V_at)printf 'return 0; }\n' >> $@ endef + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/build-aux/Makefile.each.tail/70-man.mk b/build-aux/Makefile.each.tail/70-man.mk new file mode 100644 index 0000000000..7de64224fb --- /dev/null +++ b/build-aux/Makefile.each.tail/70-man.mk @@ -0,0 +1,107 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# 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 + + +MANPAGES = +MANPAGES_ALIAS = + +include Makefile-man.am + +.PHONY: man update-man-list +man: $(MANPAGES) $(MANPAGES_ALIAS) $(HTML_FILES) $(HTML_ALIAS) + +XML_FILES = \ + ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} +HTML_FILES = \ + ${XML_FILES:.xml=.html} +HTML_ALIAS = \ + ${patsubst %.1,%.html,${patsubst %.3,%.html,${patsubst %.5,%.html,${patsubst %.7,%.html,${patsubst %.8,%.html,$(MANPAGES_ALIAS)}}}}} + +ifneq ($(ENABLE_MANPAGES),) +man_MANS = \ + $(MANPAGES) \ + $(MANPAGES_ALIAS) + +noinst_DATA += \ + $(HTML_FILES) \ + $(HTML_ALIAS) \ + docs/html/man +endif # ENABLE_MANPAGES + +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))} + +# This target should only be run manually. It recreates Makefile-man.am +# file in the source directory based on all man/*.xml files. Run it after +# adding, removing, or changing the conditional in a man page. +update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB) man/custom-entities.ent + $(AM_V_GEN)$(PYTHON) $< $(XML_GLOB) > $(top_srcdir)/Makefile-man.tmp + $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am + @echo "Makefile-man.am has been regenerated" + +$(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 + + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/build-aux/Makefile.each.tail/70-sd.mk b/build-aux/Makefile.each.tail/70-sd.mk deleted file mode 100644 index e908bd2004..0000000000 --- a/build-aux/Makefile.each.tail/70-sd.mk +++ /dev/null @@ -1,52 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# 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 - -MANPAGES = -MANPAGES_ALIAS = - -include Makefile-man.am - -.PHONY: man update-man-list -man: $(MANPAGES) $(MANPAGES_ALIAS) $(HTML_FILES) $(HTML_ALIAS) - -XML_FILES = \ - ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} -HTML_FILES = \ - ${XML_FILES:.xml=.html} -HTML_ALIAS = \ - ${patsubst %.1,%.html,${patsubst %.3,%.html,${patsubst %.5,%.html,${patsubst %.7,%.html,${patsubst %.8,%.html,$(MANPAGES_ALIAS)}}}}} - -ifneq ($(ENABLE_MANPAGES),) -man_MANS = \ - $(MANPAGES) \ - $(MANPAGES_ALIAS) - -noinst_DATA += \ - $(HTML_FILES) \ - $(HTML_ALIAS) \ - docs/html/man -endif # ENABLE_MANPAGES - -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/build-aux/Makefile.once.head/20-sd.mk b/build-aux/Makefile.once.head/20-sd.mk index a2092cdc6f..5aa4779463 100644 --- a/build-aux/Makefile.once.head/20-sd.mk +++ b/build-aux/Makefile.once.head/20-sd.mk @@ -192,4 +192,5 @@ define html-alias $(AM_V_LN)$(LN_S) -f $(notdir $<) $@ endef + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/build-aux/Makefile.once.tail/10-sd.mk b/build-aux/Makefile.once.tail/10-sd.mk index 7455244e3c..e9badd303e 100644 --- a/build-aux/Makefile.once.tail/10-sd.mk +++ b/build-aux/Makefile.once.tail/10-sd.mk @@ -94,4 +94,5 @@ list-keys: add-key: gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import - + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/config.mk.in b/config.mk.in index de6b9dad89..77283a78bf 100644 --- a/config.mk.in +++ b/config.mk.in @@ -74,4 +74,5 @@ rootprefix=@rootprefix@ rootbindir=$(rootprefix)/bin rootlibexecdir=$(rootprefix)/lib/systemd + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/discard.mk b/discard.mk index a88a5de773..32dde117ca 100644 --- a/discard.mk +++ b/discard.mk @@ -511,61 +511,6 @@ EXTRA_DIST += \ @INTLTOOL_POLICY_RULE@ -# ------------------------------------------------------------------------------ - -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))} - -# This target should only be run manually. It recreates Makefile-man.am -# file in the source directory based on all man/*.xml files. Run it after -# adding, removing, or changing the conditional in a man page. -update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB) man/custom-entities.ent - $(AM_V_GEN)$(PYTHON) $< $(XML_GLOB) > $(top_srcdir)/Makefile-man.tmp - $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am - @echo "Makefile-man.am has been regenerated" - -$(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 @@ -640,6 +585,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 @@ -845,28 +794,6 @@ EXTRA_DIST += \ man/custom-man.xsl # ------------------------------------------------------------------------------ -ifneq ($(HAVE_SYSV_COMPAT),) -sysvinit_DATA = \ - docs/sysvinit/README - -varlog_DATA = \ - docs/var-log/README - -$(outdir)/README: docs/sysvinit/README.in - $(SED_PROCESS) - -$(outdir)/README: docs/var-log/README.in - $(SED_PROCESS) - -CLEANFILES += \ - docs/sysvinit/README \ - docs/var-log/README -endif # HAVE_SYSV_COMPAT - -EXTRA_DIST += \ - docs/sysvinit/README.in \ - docs/var-log/README.in - SOCKETS_TARGET_WANTS += \ systemd-initctl.socket @@ -1069,4 +996,5 @@ tests += \ test-libsystemd-sym \ test-libudev-sym + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index ba72df7255..0000000000 --- a/src/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# 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 - -nested.subdirs += busctl -nested.subdirs += grp-boot -nested.subdirs += grp-coredump -nested.subdirs += grp-hostname -nested.subdirs += grp-initprogs -nested.subdirs += grp-journal -nested.subdirs += grp-locale -nested.subdirs += grp-login -nested.subdirs += grp-machine -nested.subdirs += grp-network -nested.subdirs += grp-resolve -nested.subdirs += grp-system -nested.subdirs += grp-timedate -nested.subdirs += grp-udev -nested.subdirs += libbasic -nested.subdirs += libfirewall -nested.subdirs += libshared -nested.subdirs += libsystemd -nested.subdirs += libsystemd-network -nested.subdirs += libudev -nested.subdirs += nss-myhostname -nested.subdirs += systemd-ask-password -nested.subdirs += systemd-cgls -nested.subdirs += systemd-cgroups-agent -nested.subdirs += systemd-cgtop -nested.subdirs += systemd-cryptsetup -nested.subdirs += systemd-dbus1-generator -nested.subdirs += systemd-debug-generator -nested.subdirs += systemd-getty-generator -nested.subdirs += systemd-gpt-auto-generator -nested.subdirs += systemd-initctl -nested.subdirs += systemd-machine-id-setup -nested.subdirs += systemd-nspawn -nested.subdirs += systemd-rc-local-generator -nested.subdirs += systemd-remount-fs -nested.subdirs += systemd-reply-password -nested.subdirs += systemd-socket-proxyd -nested.subdirs += systemd-stdio-bridge -nested.subdirs += systemd-system-update-generator -nested.subdirs += systemd-timesyncd -nested.subdirs += systemd-tty-ask-password-agent -nested.subdirs += test - -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-boot/Makefile b/src/grp-boot/Makefile deleted file mode 100644 index df1febe823..0000000000 --- a/src/grp-boot/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# 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 - -nested.subdirs += bootctl -nested.subdirs += kernel-install -nested.subdirs += systemd-boot - -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-coredump/Makefile b/src/grp-coredump/Makefile deleted file mode 100644 index c2bbf948e9..0000000000 --- a/src/grp-coredump/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# 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 - -nested.subdirs += coredumpctl -nested.subdirs += systemd-coredump - -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-initprogs/Makefile b/src/grp-initprogs/Makefile deleted file mode 100644 index 2cf2214e2a..0000000000 --- a/src/grp-initprogs/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# 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 - -nested.subdirs += grp-sleep -nested.subdirs += systemd-backlight -nested.subdirs += systemd-binfmt -nested.subdirs += systemd-detect-virt -nested.subdirs += systemd-firstboot -nested.subdirs += systemd-fsck -nested.subdirs += systemd-modules-load -nested.subdirs += systemd-quotacheck -nested.subdirs += systemd-random-seed -nested.subdirs += systemd-rfkill -nested.subdirs += systemd-sysctl -nested.subdirs += systemd-sysusers -nested.subdirs += systemd-tmpfiles -nested.subdirs += systemd-update-done -nested.subdirs += systemd-update-utmp -nested.subdirs += systemd-user-sessions -nested.subdirs += systemd-vconsole-setup - -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-initprogs/systemd-sysusers/Makefile b/src/grp-initprogs/systemd-sysusers/Makefile index 4753ca75d0..c2c6254a1e 100644 --- a/src/grp-initprogs/systemd-sysusers/Makefile +++ b/src/grp-initprogs/systemd-sysusers/Makefile @@ -43,11 +43,6 @@ nodist_sysusers_DATA = \ sysusers.d/systemd.conf \ sysusers.d/basic.conf -ifneq ($(HAVE_REMOTE),) -nodist_sysusers_DATA += \ - sysusers.d/systemd-remote.conf -endif # HAVE_REMOTE - INSTALL_DIRS += \ $(sysusersdir) endif # ENABLE_SYSUSERS diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile index 35ece6e443..91293d8dfa 100644 --- a/src/grp-journal/Makefile +++ b/src/grp-journal/Makefile @@ -167,9 +167,25 @@ tests += \ test-compress-benchmark endif # HAVE_COMPRESSION +ifneq ($(HAVE_SYSV_COMPAT),) + +varlog_DATA = \ + docs/var-log/README + +$(outdir)/README: docs/var-log/README.in + $(SED_PROCESS) + +CLEANFILES += \ + docs/var-log/README +endif # HAVE_SYSV_COMPAT + +EXTRA_DIST += \ + docs/var-log/README.in + nested.subdirs += grp-remote nested.subdirs += journalctl nested.subdirs += libjournal-core +nested.subdirs += systemd-cat nested.subdirs += systemd-journald include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-journal/journalctl/Makefile b/src/grp-journal/journalctl/Makefile index c3cdb6b27a..6f464dec7f 100644 --- a/src/grp-journal/journalctl/Makefile +++ b/src/grp-journal/journalctl/Makefile @@ -46,4 +46,7 @@ journalctl_LDADD += \ $(QRENCODE_LIBS) endif # HAVE_QRENCODE +rootbin_PROGRAMS += \ + journalctl + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-initprogs/grp-sleep/Makefile b/src/grp-journal/systemd-cat/Makefile index 5a3a87d2bf..77c0861f2c 100644 --- a/src/grp-initprogs/grp-sleep/Makefile +++ b/src/grp-journal/systemd-cat/Makefile @@ -23,8 +23,13 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -nested.subdirs += systemd-hibernate-resume -nested.subdirs += systemd-hibernate-resume-generator -nested.subdirs += systemd-sleep +systemd_cat_SOURCES = \ + src/journal/cat.c + +systemd_cat_LDADD = \ + libjournal-core.la + +bin_PROGRAMS += \ + systemd-cat include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-journal/systemd-journald/Makefile b/src/grp-journal/systemd-journald/Makefile index 046f0e8a3c..640528bae4 100644 --- a/src/grp-journal/systemd-journald/Makefile +++ b/src/grp-journal/systemd-journald/Makefile @@ -31,21 +31,9 @@ systemd_journald_LDADD = \ libjournal-core.la \ libshared.la -systemd_cat_SOURCES = \ - src/journal/cat.c - -systemd_cat_LDADD = \ - libjournal-core.la - rootlibexec_PROGRAMS += \ systemd-journald -rootbin_PROGRAMS += \ - journalctl - -bin_PROGRAMS += \ - systemd-cat - dist_systemunit_DATA += \ units/systemd-journald.socket \ units/systemd-journald-dev-log.socket \ diff --git a/src/grp-hostname/Makefile b/src/grp-locale/localectl/Makefile index 939c268c10..9a661bce68 100644 --- a/src/grp-hostname/Makefile +++ b/src/grp-locale/localectl/Makefile @@ -20,10 +20,24 @@ # # 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 $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -nested.subdirs += hostnamectl -nested.subdirs += systemd-hostnamed +ifneq ($(ENABLE_LOCALED),) +localectl_SOURCES = \ + src/locale/localectl.c + +localectl_LDADD = \ + libshared.la + +bin_PROGRAMS += \ + localectl + +dist_bashcompletion_data += \ + shell-completion/bash/localectl + +dist_zshcompletion_data += \ + shell-completion/zsh/_localectl +endif # ENABLE_LOCALED include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-locale/Makefile b/src/grp-locale/systemd-localed/Makefile index b34c066ec2..8c0c775d35 100644 --- a/src/grp-locale/Makefile +++ b/src/grp-locale/systemd-localed/Makefile @@ -20,7 +20,7 @@ # # 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 $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk ifneq ($(ENABLE_LOCALED),) @@ -63,20 +63,6 @@ dist_pkgdata_DATA = \ src/locale/kbd-model-map \ src/locale/language-fallback-map -localectl_SOURCES = \ - src/locale/localectl.c - -localectl_LDADD = \ - libshared.la - -bin_PROGRAMS += \ - localectl - -dist_bashcompletion_data += \ - shell-completion/bash/localectl - -dist_zshcompletion_data += \ - shell-completion/zsh/_localectl endif # ENABLE_LOCALED .PHONY: update-kbd-model-map diff --git a/src/grp-login/Makefile b/src/grp-login/Makefile index cca3e844e1..df84beb266 100644 --- a/src/grp-login/Makefile +++ b/src/grp-login/Makefile @@ -56,61 +56,6 @@ tests += \ test-login-tables \ test-login-shared -nodist_systemunit_DATA += \ - units/systemd-logind.service - -dist_systemunit_DATA += \ - units/user.slice - -dist_systemunit_DATA_busnames += \ - units/org.freedesktop.login1.busname - -dist_dbussystemservice_DATA += \ - src/login/org.freedesktop.login1.service - -dist_dbuspolicy_DATA += \ - src/login/org.freedesktop.login1.conf - -nodist_pkgsysconf_DATA += \ - src/login/logind.conf - -polkitpolicy_files += \ - src/login/org.freedesktop.login1.policy - -INSTALL_DIRS += \ - $(systemdstatedir) - -MULTI_USER_TARGET_WANTS += \ - systemd-logind.service - -SYSTEM_UNIT_ALIASES += \ - systemd-logind.service dbus-org.freedesktop.login1.service - -BUSNAMES_TARGET_WANTS += \ - org.freedesktop.login1.busname - -dist_udevrules_DATA += \ - src/login/70-uaccess.rules \ - src/login/70-power-switch.rules - -nodist_udevrules_DATA += \ - src/login/71-seat.rules \ - src/login/73-seat-late.rules - -endif # ENABLE_LOGIND - -polkitpolicy_in_files += \ - src/login/org.freedesktop.login1.policy.in - -gperf_gperf_sources += \ - src/login/logind-gperf.gperf - -EXTRA_DIST += \ - src/login/71-seat.rules.in \ - src/login/73-seat-late.rules.in \ - units/systemd-logind.service.in \ - src/login/logind.conf.in - nested.subdirs += loginctl nested.subdirs += pam_systemd nested.subdirs += systemd-inhibit diff --git a/src/grp-login/systemd-logind/Makefile b/src/grp-login/systemd-logind/Makefile index b4da812a3e..2df5ecc008 100644 --- a/src/grp-login/systemd-logind/Makefile +++ b/src/grp-login/systemd-logind/Makefile @@ -72,4 +72,59 @@ noinst_LTLIBRARIES += \ rootlibexec_PROGRAMS += \ systemd-logind +nodist_systemunit_DATA += \ + units/systemd-logind.service + +dist_systemunit_DATA += \ + units/user.slice + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.login1.busname + +dist_dbussystemservice_DATA += \ + src/login/org.freedesktop.login1.service + +dist_dbuspolicy_DATA += \ + src/login/org.freedesktop.login1.conf + +nodist_pkgsysconf_DATA += \ + src/login/logind.conf + +polkitpolicy_files += \ + src/login/org.freedesktop.login1.policy + +INSTALL_DIRS += \ + $(systemdstatedir) + +MULTI_USER_TARGET_WANTS += \ + systemd-logind.service + +SYSTEM_UNIT_ALIASES += \ + systemd-logind.service dbus-org.freedesktop.login1.service + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.login1.busname + +dist_udevrules_DATA += \ + src/login/70-uaccess.rules \ + src/login/70-power-switch.rules + +nodist_udevrules_DATA += \ + src/login/71-seat.rules \ + src/login/73-seat-late.rules + +endif # ENABLE_LOGIND + +polkitpolicy_in_files += \ + src/login/org.freedesktop.login1.policy.in + +gperf_gperf_sources += \ + src/login/logind-gperf.gperf + +EXTRA_DIST += \ + src/login/71-seat.rules.in \ + src/login/73-seat-late.rules.in \ + units/systemd-logind.service.in \ + src/login/logind.conf.in + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile deleted file mode 100644 index 4692e99c02..0000000000 --- a/src/grp-machine/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# 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 - -nested.subdirs += machinectl -nested.subdirs += nss-mymachines -nested.subdirs += systemd-machined - -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-resolve/systemd-resolve/Makefile b/src/grp-resolve/systemd-resolve/Makefile new file mode 100644 index 0000000000..993663b43d --- /dev/null +++ b/src/grp-resolve/systemd-resolve/Makefile @@ -0,0 +1,117 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# 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 + +systemd_resolve_SOURCES = \ + src/resolve/resolve-tool.c \ + $(basic_dns_sources) \ + src/shared/gcrypt-util.c \ + src/shared/gcrypt-util.h + +nodist_systemd_resolve_SOURCES = \ + src/resolve/dns_type-from-name.h \ + src/resolve/dns_type-to-name.h + +systemd_resolve_LDADD = \ + libshared.la + +bin_PROGRAMS += \ + systemd-resolve + +dist_bashcompletion_data += \ + shell-completion/bash/systemd-resolve + +dist_zshcompletion_data += \ + shell-completion/zsh/_systemd-resolve + +tests += \ + test-dns-packet \ + test-resolve-tables \ + test-dnssec + +manual_tests += \ + test-dnssec-complex + +test_resolve_tables_SOURCES = \ + src/resolve/test-resolve-tables.c \ + src/resolve/dns_type-from-name.h \ + src/resolve/dns_type-to-name.h \ + $(basic_dns_sources) \ + src/shared/test-tables.h + +test_resolve_tables_LDADD = \ + libshared.la + +test_dns_packet_SOURCES = \ + src/resolve/test-dns-packet.c \ + $(basic_dns_sources) + +test_dns_packet_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DRESOLVE_TEST_DIR=\"$(abs_top_srcdir)/src/resolve/test-data\" + +test_dns_packet_LDADD = \ + libshared.la + +EXTRA_DIST += \ + src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts \ + src/resolve/test-data/fedoraproject.org.pkts \ + src/resolve/test-data/gandi.net.pkts \ + src/resolve/test-data/google.com.pkts \ + src/resolve/test-data/root.pkts \ + src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts \ + src/resolve/test-data/teamits.com.pkts \ + src/resolve/test-data/zbyszek@fedoraproject.org.pkts \ + src/resolve/test-data/_443._tcp.fedoraproject.org.pkts \ + src/resolve/test-data/kyhwana.org.pkts \ + src/resolve/test-data/fake-caa.pkts + +test_dnssec_SOURCES = \ + src/resolve/test-dnssec.c \ + $(basic_dns_sources) + +test_dnssec_LDADD = \ + libshared.la + +test_dnssec_complex_SOURCES = \ + src/resolve/test-dnssec-complex.c \ + src/resolve/dns-type.c \ + src/resolve/dns-type.h + +test_dnssec_complex_LDADD = \ + libshared.la + +endif # ENABLE_RESOLVED + +gperf_txt_sources += \ + src/resolve/dns_type-list.txt + +gperf_gperf_sources += \ + src/resolve/resolved-gperf.gperf + +EXTRA_DIST += \ + units/systemd-resolved.service.m4.in \ + src/resolve/resolved.conf.in + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile index 31bd6d6ed1..d163033a47 100644 --- a/src/grp-resolve/systemd-resolved/Makefile +++ b/src/grp-resolve/systemd-resolved/Makefile @@ -132,95 +132,4 @@ GENERAL_ALIASES += \ nodist_pkgsysconf_DATA += \ src/resolve/resolved.conf -systemd_resolve_SOURCES = \ - src/resolve/resolve-tool.c \ - $(basic_dns_sources) \ - src/shared/gcrypt-util.c \ - src/shared/gcrypt-util.h - -nodist_systemd_resolve_SOURCES = \ - src/resolve/dns_type-from-name.h \ - src/resolve/dns_type-to-name.h - -systemd_resolve_LDADD = \ - libshared.la - -bin_PROGRAMS += \ - systemd-resolve - -dist_bashcompletion_data += \ - shell-completion/bash/systemd-resolve - -dist_zshcompletion_data += \ - shell-completion/zsh/_systemd-resolve - -tests += \ - test-dns-packet \ - test-resolve-tables \ - test-dnssec - -manual_tests += \ - test-dnssec-complex - -test_resolve_tables_SOURCES = \ - src/resolve/test-resolve-tables.c \ - src/resolve/dns_type-from-name.h \ - src/resolve/dns_type-to-name.h \ - $(basic_dns_sources) \ - src/shared/test-tables.h - -test_resolve_tables_LDADD = \ - libshared.la - -test_dns_packet_SOURCES = \ - src/resolve/test-dns-packet.c \ - $(basic_dns_sources) - -test_dns_packet_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DRESOLVE_TEST_DIR=\"$(abs_top_srcdir)/src/resolve/test-data\" - -test_dns_packet_LDADD = \ - libshared.la - -EXTRA_DIST += \ - src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts \ - src/resolve/test-data/fedoraproject.org.pkts \ - src/resolve/test-data/gandi.net.pkts \ - src/resolve/test-data/google.com.pkts \ - src/resolve/test-data/root.pkts \ - src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts \ - src/resolve/test-data/teamits.com.pkts \ - src/resolve/test-data/zbyszek@fedoraproject.org.pkts \ - src/resolve/test-data/_443._tcp.fedoraproject.org.pkts \ - src/resolve/test-data/kyhwana.org.pkts \ - src/resolve/test-data/fake-caa.pkts - -test_dnssec_SOURCES = \ - src/resolve/test-dnssec.c \ - $(basic_dns_sources) - -test_dnssec_LDADD = \ - libshared.la - -test_dnssec_complex_SOURCES = \ - src/resolve/test-dnssec-complex.c \ - src/resolve/dns-type.c \ - src/resolve/dns-type.h - -test_dnssec_complex_LDADD = \ - libshared.la - -endif # ENABLE_RESOLVED - -gperf_txt_sources += \ - src/resolve/dns_type-list.txt - -gperf_gperf_sources += \ - src/resolve/resolved-gperf.gperf - -EXTRA_DIST += \ - units/systemd-resolved.service.m4.in \ - src/resolve/resolved.conf.in - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/Makefile b/src/grp-system/Makefile deleted file mode 100644 index b4bff093f6..0000000000 --- a/src/grp-system/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# 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 - -nested.subdirs += libcore -nested.subdirs += systemctl -nested.subdirs += systemd -nested.subdirs += systemd-shutdown - -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/grp-utils/systemd-sysv-generator/Makefile b/src/grp-system/grp-utils/systemd-sysv-generator/Makefile index 10dd75abc6..9dec62efdc 100644 --- a/src/grp-system/grp-utils/systemd-sysv-generator/Makefile +++ b/src/grp-system/grp-utils/systemd-sysv-generator/Makefile @@ -29,4 +29,18 @@ systemd_sysv_generator_SOURCES = \ systemd_sysv_generator_LDADD = \ libcore.la +ifneq ($(HAVE_SYSV_COMPAT),) +sysvinit_DATA = \ + docs/sysvinit/README + +$(outdir)/README: docs/sysvinit/README.in + $(SED_PROCESS) + +CLEANFILES += \ + docs/sysvinit/README +endif # HAVE_SYSV_COMPAT + +EXTRA_DIST += \ + docs/sysvinit/README.in + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-timedate/Makefile b/src/grp-timedate/Makefile deleted file mode 100644 index b9277c7c64..0000000000 --- a/src/grp-timedate/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# 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 - -nested.subdirs += systemd-timedated -nested.subdirs += timedatectl - -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile index bc889eac2b..6b4f56e490 100644 --- a/src/grp-udev/libudev-core/Makefile +++ b/src/grp-udev/libudev-core/Makefile @@ -98,4 +98,6 @@ libudev_core_la_SOURCES += \ src/systemd/sd-login.h endif # HAVE_ACL +nested.subdirs += net + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-resolve/Makefile b/src/grp-udev/libudev-core/net/Makefile index ccff3bfbeb..b094ad75cf 100644 --- a/src/grp-resolve/Makefile +++ b/src/grp-udev/libudev-core/net/Makefile @@ -20,10 +20,10 @@ # # 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 $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -nested.subdirs += nss-resolve -nested.subdirs += systemd-resolved +sd.CPPFLAGS += $(libshared.CPPFLAGS) +sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/src/subdir.mk b/src/libsystemd/src/subdir.mk index 35def00fdc..605b592401 100644 --- a/src/libsystemd/src/subdir.mk +++ b/src/libsystemd/src/subdir.mk @@ -23,7 +23,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -systemd.CPPFLAGS += -DLIBDIR=\"$(libdir)\" -systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" +sd.CPPFLAGS += -DLIBDIR=\"$(libdir)\" +sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libudev/Makefile b/src/libudev/Makefile deleted file mode 100644 index 369b265ff7..0000000000 --- a/src/libudev/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# 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 - -nested.subdirs += src - -include $(topsrcdir)/build-aux/Makefile.tail.mk |