diff options
| -rw-r--r-- | Makefile | 48 | ||||
| -rw-r--r-- | Makefile.am | 126 | ||||
| -rw-r--r-- | build-aux/Makefile.each.tail/50-sd.mk (renamed from build-aux/Makefile.each.tail/20-sd.mk) | 12 | ||||
| -rw-r--r-- | build-aux/Makefile.each.tail/70-sd.mk | 52 | ||||
| -rw-r--r-- | build-aux/Makefile.once.head/20-sd.mk | 12 | ||||
| -rw-r--r-- | build-aux/Makefile.once.tail/10-sd.mk (renamed from build-aux/Makefile.once.tail/20-sd.mk) | 0 | ||||
| -rw-r--r-- | discard.mk | 26 | ||||
| -rw-r--r-- | src/Makefile | 42 | ||||
| -rw-r--r-- | src/grp-boot/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-hostname/Makefile | 53 | ||||
| -rw-r--r-- | src/grp-hostname/hostnamectl/Makefile | 44 | ||||
| -rw-r--r-- | src/grp-hostname/systemd-hostnamed/Makefile | 64 | ||||
| -rw-r--r-- | src/grp-initprogs/Makefile | 44 | ||||
| -rw-r--r-- | src/grp-initprogs/grp-sleep/Makefile | 30 | ||||
| -rw-r--r-- | src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/Makefile | 37 | ||||
| -rw-r--r-- | src/grp-initprogs/grp-sleep/systemd-hibernate-resume/Makefile | 9 | ||||
| -rw-r--r-- | src/grp-journal/grp-remote/Makefile | 55 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/systemd-importd/Makefile | 55 |
18 files changed, 545 insertions, 166 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000..babbfd4050 --- /dev/null +++ b/Makefile @@ -0,0 +1,48 @@ +# -*- 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 + +# intltoolize +files.src.gen += m4/intltool.m4 +files.src.gen += po/Makefile.in.in +# autoreconf +files.src.gen += aclocal.m4 +files.src.gen += automake.mk.in +files.src.gen += build-aux/compile +files.src.gen += build-aux/config.guess +files.src.gen += build-aux/config.sub +files.src.gen += build-aux/install-sh +files.src.gen += build-aux/ltmain.sh +files.src.gen += build-aux/missing +files.src.gen += m4/libtool.m4 +files.src.gen += m4/ltoptions.m4 +files.src.gen += m4/ltsugar.m4 +files.src.gen += m4/ltversion.m4 +files.src.gen += m4/lt~obsolete.m4 +files.src.gen += config.h.in +files.src.gen += configure + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/Makefile.am b/Makefile.am index c3fb64acd8..996ecdcfcc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -741,6 +741,7 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ +#@build-aux/Makefile.each.tail/70-sd.mk MANPAGES = MANPAGES_ALIAS = @@ -767,6 +768,7 @@ noinst_DATA += \ docs/html/man endif # ENABLE_MANPAGES +#@discard.mk CLEANFILES += \ $(man_MANS) \ $(HTML_FILES) \ @@ -1360,7 +1362,7 @@ EXTRA_DIST += \ CLEANFILES += \ $(gperf_txt_sources) -#@build-aux/Makefile.each.tail/20-sd.mk +#@build-aux/Makefile.each.tail/50-sd.mk %-from-name.gperf: %-list.txt $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $(notdir $*)_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@ @@ -2734,11 +2736,13 @@ systemd_system_update_generator_SOURCES = \ systemd_system_update_generator_LDADD = \ libshared.la -#@auto/systemd-hibernate-resume/Makefile --------------------------------------- +#@auto/systemd-hibernate-resume-generator/Makefile ----------------------------- if ENABLE_HIBERNATE systemgenerator_PROGRAMS += \ systemd-hibernate-resume-generator +#@auto/systemd-hibernate-resume/Makefile +if ENABLE_HIBERNATE rootlibexec_PROGRAMS += \ systemd-hibernate-resume @@ -2748,12 +2752,15 @@ systemd_hibernate_resume_SOURCES = \ systemd_hibernate_resume_LDADD = \ libshared.la +#@auto/systemd-hibernate-resume-generator/Makefile systemd_hibernate_resume_generator_SOURCES = \ src/hibernate-resume/hibernate-resume-generator.c systemd_hibernate_resume_generator_LDADD = \ libshared.la +endif # ENABLE_HIBERNATE +#@auto/systemd-hibernate-resume/Makefile dist_systemunit_DATA += \ units/hibernate.target \ units/hybrid-sleep.target @@ -4801,7 +4808,7 @@ SYSINIT_TARGET_WANTS += \ endif # HAVE_LIBCRYPTSETUP -#@src/grp-hostname/Makefile ---------------------------------------------------- +#@auto/systemd-hostnamed/Makefile ---------------------------------------------- if ENABLE_HOSTNAMED systemd_hostnamed_SOURCES = \ src/hostname/hostnamed.c @@ -4833,6 +4840,10 @@ SYSTEM_UNIT_ALIASES += \ BUSNAMES_TARGET_WANTS += \ org.freedesktop.hostname1.busname +endif # ENABLE_HOSTNAMED +#@auto/hostnamectl/Makefile +if ENABLE_HOSTNAMED + hostnamectl_SOURCES = \ src/hostname/hostnamectl.c @@ -4849,6 +4860,7 @@ dist_zshcompletion_data += \ shell-completion/zsh/_hostnamectl endif # ENABLE_HOSTNAMED +#@auto/systemd-hostnamed/Makefile polkitpolicy_in_files += \ src/hostname/org.freedesktop.hostname1.policy.in @@ -5286,7 +5298,7 @@ systemd_export_LDADD = \ $(ZLIB_LIBS) \ $(BZIP2_LIBS) -#@src/grp-journal/grp-remote/Makefile +#@auto/systemd-importd/Makefile dist_rootlibexec_DATA = \ src/import/import-pubring.gpg @@ -6094,7 +6106,7 @@ units/%: units/%.in man/%: man/%.in $(SED_PROCESS) -#@build-aux/Makefile.each.tail/20-sd.mk +#@build-aux/Makefile.each.tail/50-sd.mk sysctl.d/%: sysctl.d/%.in $(SED_PROCESS) @@ -6120,7 +6132,7 @@ shell-completion/%: shell-completion/%.in %.conf: %.conf.in $(SED_PROCESS) -#@build-aux/Makefile.each.tail/20-sd.mk +#@build-aux/Makefile.each.tail/50-sd.mk %.sh: %.sh.in $(SED_PROCESS) $(AM_V_GEN)chmod +x $@ @@ -6190,7 +6202,7 @@ XSLTPROC_PROCESS_MAN = \ XSLTPROC_PROCESS_HTML = \ $(AM_V_XSLT)$(XSLT) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< -#@build-aux/Makefile.each.tail/20-sd.mk +#@build-aux/Makefile.each.tail/50-sd.mk man/%.1: man/%.xml man/custom-man.xsl man/custom-entities.ent $(XSLTPROC_PROCESS_MAN) @@ -6444,7 +6456,7 @@ install-tree: all $(MAKE) install DESTDIR=$(abs_srcdir)/install-tree tree $(abs_srcdir)/install-tree -#@build-aux/Makefile.once.tail/20-sd.mk +#@build-aux/Makefile.once.tail/10-sd.mk # Let's run all tests of the test suite, but under valgrind. Let's # exclude perl/python/shell scripts we have in there .PHONY: valgrind-tests @@ -6497,7 +6509,7 @@ check-includes: $(top_srcdir)/tools/check-includes.pl EXTRA_DIST += \ $(top_srcdir)/tools/check-includes.pl -#@build-aux/Makefile.once.head/20-sd.mk +#@build-aux/Makefile.each.tail/50-sd.mk # Stupid test that everything purported to be exported really is define generate-sym-test $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -6557,7 +6569,7 @@ tests += \ test-libsystemd-sym \ test-libudev-sym -#@build-aux/Makefile.once.tail/20-sd.mk +#@build-aux/Makefile.once.tail/10-sd.mk .PHONY: cppcheck cppcheck: cppcheck --enable=all -q $(top_srcdir) @@ -6577,7 +6589,96 @@ 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 +# autoreconf +files.src.gen += aclocal.m4 +files.src.gen += automake.mk.in +files.src.gen += build-aux/compile +files.src.gen += build-aux/config.guess +files.src.gen += build-aux/config.sub +files.src.gen += build-aux/install-sh +files.src.gen += build-aux/ltmain.sh +files.src.gen += build-aux/missing +files.src.gen += m4/libtool.m4 +files.src.gen += m4/ltoptions.m4 +files.src.gen += m4/ltsugar.m4 +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 @@ -6587,7 +6688,7 @@ systemd.CPPFLAGS += -DLIBDIR=\"$(libdir)\" systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" #@src/grp-boot/Makefile -nested.subdirs += bootctl systemd-boot +nested.subdirs += bootctl systemd-boot kernel-install #@src/grp-coredump/Makefile nested.subdirs += coredumpctl systemd-coredump @@ -6610,5 +6711,8 @@ nested.subdirs += systemctl systemd #@src/grp-timedate/Makefile nested.subdirs += timedatectl systemd-timedated +#@src/grp-hostname/Makefile +nested.subdirs += systemd-hostnamed hostnamectl + #@all include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/build-aux/Makefile.each.tail/20-sd.mk b/build-aux/Makefile.each.tail/50-sd.mk index a7087f6568..608f9b0e8e 100644 --- a/build-aux/Makefile.each.tail/20-sd.mk +++ b/build-aux/Makefile.each.tail/50-sd.mk @@ -64,4 +64,16 @@ $(outdir)/%.8: man/%.xml man/custom-man.xsl man/custom-entities.ent $(outdir)/%.html: man/%.xml man/custom-html.xsl man/custom-entities.ent $(XSLTPROC_PROCESS_HTML) +# Stupid test that everything purported to be exported really is +define generate-sym-test + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_at)printf '#include <stdio.h>\n' > $@ + $(AM_V_at)printf '#include "%s"\n' $(notdir $(filter %.h, $^)) >> $@ + $(AM_V_at)printf 'void* functions[] = {\n' >> $@ + $(AM_V_GEN)sed -r -n 's/^ +([a-zA-Z0-9_]+);/\1,/p' $< >> $@ + $(AM_V_at)printf '};\nint main(void) {\n' >> $@ + $(AM_V_at)printf 'unsigned i; for (i=0;i<sizeof(functions)/sizeof(void*);i++) printf("%%p\\n", functions[i]);\n' >> $@ + $(AM_V_at)printf 'return 0; }\n' >> $@ +endef + 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 new file mode 100644 index 0000000000..e908bd2004 --- /dev/null +++ b/build-aux/Makefile.each.tail/70-sd.mk @@ -0,0 +1,52 @@ +# -*- 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 407dde14c4..a2092cdc6f 100644 --- a/build-aux/Makefile.once.head/20-sd.mk +++ b/build-aux/Makefile.once.head/20-sd.mk @@ -192,16 +192,4 @@ define html-alias $(AM_V_LN)$(LN_S) -f $(notdir $<) $@ endef -# Stupid test that everything purported to be exported really is -define generate-sym-test - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_at)printf '#include <stdio.h>\n' > $@ - $(AM_V_at)printf '#include "%s"\n' $(notdir $(filter %.h, $^)) >> $@ - $(AM_V_at)printf 'void* functions[] = {\n' >> $@ - $(AM_V_GEN)sed -r -n 's/^ +([a-zA-Z0-9_]+);/\1,/p' $< >> $@ - $(AM_V_at)printf '};\nint main(void) {\n' >> $@ - $(AM_V_at)printf 'unsigned i; for (i=0;i<sizeof(functions)/sizeof(void*);i++) printf("%%p\\n", functions[i]);\n' >> $@ - $(AM_V_at)printf 'return 0; }\n' >> $@ -endef - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/build-aux/Makefile.once.tail/20-sd.mk b/build-aux/Makefile.once.tail/10-sd.mk index 7455244e3c..7455244e3c 100644 --- a/build-aux/Makefile.once.tail/20-sd.mk +++ b/build-aux/Makefile.once.tail/10-sd.mk diff --git a/discard.mk b/discard.mk index aa2e6c1c8b..a88a5de773 100644 --- a/discard.mk +++ b/discard.mk @@ -513,32 +513,6 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ -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) \ diff --git a/src/Makefile b/src/Makefile index b84e6076a0..905d11d803 100644 --- a/src/Makefile +++ b/src/Makefile @@ -23,5 +23,47 @@ 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 += 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 include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-boot/Makefile b/src/grp-boot/Makefile index 418f942c0a..6f46e5e035 100644 --- a/src/grp-boot/Makefile +++ b/src/grp-boot/Makefile @@ -23,6 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -nested.subdirs += bootctl systemd-boot +nested.subdirs += bootctl systemd-boot kernel-install include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-hostname/Makefile b/src/grp-hostname/Makefile index 911188454c..319c1d2c8e 100644 --- a/src/grp-hostname/Makefile +++ b/src/grp-hostname/Makefile @@ -23,57 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -ifneq ($(ENABLE_HOSTNAMED),) -systemd_hostnamed_SOURCES = \ - src/hostname/hostnamed.c - -systemd_hostnamed_LDADD = \ - libshared.la - -rootlibexec_PROGRAMS += \ - systemd-hostnamed - -nodist_systemunit_DATA += \ - units/systemd-hostnamed.service - -dist_systemunit_DATA_busnames += \ - units/org.freedesktop.hostname1.busname - -dist_dbuspolicy_DATA += \ - src/hostname/org.freedesktop.hostname1.conf - -dist_dbussystemservice_DATA += \ - src/hostname/org.freedesktop.hostname1.service - -polkitpolicy_files += \ - src/hostname/org.freedesktop.hostname1.policy - -SYSTEM_UNIT_ALIASES += \ - systemd-hostnamed.service dbus-org.freedesktop.hostname1.service - -BUSNAMES_TARGET_WANTS += \ - org.freedesktop.hostname1.busname - -hostnamectl_SOURCES = \ - src/hostname/hostnamectl.c - -hostnamectl_LDADD = \ - libshared.la - -bin_PROGRAMS += \ - hostnamectl - -dist_bashcompletion_data += \ - shell-completion/bash/hostnamectl - -dist_zshcompletion_data += \ - shell-completion/zsh/_hostnamectl -endif # ENABLE_HOSTNAMED - -polkitpolicy_in_files += \ - src/hostname/org.freedesktop.hostname1.policy.in - -EXTRA_DIST += \ - units/systemd-hostnamed.service.in +nested.subdirs += systemd-hostnamed hostnamectl include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-hostname/hostnamectl/Makefile b/src/grp-hostname/hostnamectl/Makefile new file mode 100644 index 0000000000..a75fb56cbd --- /dev/null +++ b/src/grp-hostname/hostnamectl/Makefile @@ -0,0 +1,44 @@ +# -*- 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 + +ifneq ($(ENABLE_HOSTNAMED),) + +hostnamectl_SOURCES = \ + src/hostname/hostnamectl.c + +hostnamectl_LDADD = \ + libshared.la + +bin_PROGRAMS += \ + hostnamectl + +dist_bashcompletion_data += \ + shell-completion/bash/hostnamectl + +dist_zshcompletion_data += \ + shell-completion/zsh/_hostnamectl +endif # ENABLE_HOSTNAMED + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-hostname/systemd-hostnamed/Makefile b/src/grp-hostname/systemd-hostnamed/Makefile new file mode 100644 index 0000000000..dce9d99feb --- /dev/null +++ b/src/grp-hostname/systemd-hostnamed/Makefile @@ -0,0 +1,64 @@ +# -*- 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 + +ifneq ($(ENABLE_HOSTNAMED),) +systemd_hostnamed_SOURCES = \ + src/hostname/hostnamed.c + +systemd_hostnamed_LDADD = \ + libshared.la + +rootlibexec_PROGRAMS += \ + systemd-hostnamed + +nodist_systemunit_DATA += \ + units/systemd-hostnamed.service + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.hostname1.busname + +dist_dbuspolicy_DATA += \ + src/hostname/org.freedesktop.hostname1.conf + +dist_dbussystemservice_DATA += \ + src/hostname/org.freedesktop.hostname1.service + +polkitpolicy_files += \ + src/hostname/org.freedesktop.hostname1.policy + +SYSTEM_UNIT_ALIASES += \ + systemd-hostnamed.service dbus-org.freedesktop.hostname1.service + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.hostname1.busname + +endif # ENABLE_HOSTNAMED +polkitpolicy_in_files += \ + src/hostname/org.freedesktop.hostname1.policy.in + +EXTRA_DIST += \ + units/systemd-hostnamed.service.in + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-initprogs/Makefile b/src/grp-initprogs/Makefile new file mode 100644 index 0000000000..2cf2214e2a --- /dev/null +++ b/src/grp-initprogs/Makefile @@ -0,0 +1,44 @@ +# -*- 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/grp-sleep/Makefile b/src/grp-initprogs/grp-sleep/Makefile new file mode 100644 index 0000000000..5a3a87d2bf --- /dev/null +++ b/src/grp-initprogs/grp-sleep/Makefile @@ -0,0 +1,30 @@ +# -*- 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-hibernate-resume +nested.subdirs += systemd-hibernate-resume-generator +nested.subdirs += systemd-sleep + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/Makefile b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/Makefile new file mode 100644 index 0000000000..a0ca685a00 --- /dev/null +++ b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/Makefile @@ -0,0 +1,37 @@ +# -*- 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 + +ifneq ($(ENABLE_HIBERNATE),) +systemgenerator_PROGRAMS += \ + systemd-hibernate-resume-generator + +systemd_hibernate_resume_generator_SOURCES = \ + src/hibernate-resume/hibernate-resume-generator.c + +systemd_hibernate_resume_generator_LDADD = \ + libshared.la +endif # ENABLE_HIBERNATE + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/Makefile b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/Makefile index 4a5590dbf5..00c6b88d9e 100644 --- a/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/Makefile +++ b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/Makefile @@ -24,9 +24,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk ifneq ($(ENABLE_HIBERNATE),) -systemgenerator_PROGRAMS += \ - systemd-hibernate-resume-generator - rootlibexec_PROGRAMS += \ systemd-hibernate-resume @@ -36,12 +33,6 @@ systemd_hibernate_resume_SOURCES = \ systemd_hibernate_resume_LDADD = \ libshared.la -systemd_hibernate_resume_generator_SOURCES = \ - src/hibernate-resume/hibernate-resume-generator.c - -systemd_hibernate_resume_generator_LDADD = \ - libshared.la - dist_systemunit_DATA += \ units/hibernate.target \ units/hybrid-sleep.target diff --git a/src/grp-journal/grp-remote/Makefile b/src/grp-journal/grp-remote/Makefile index e4980fac9a..737faaba4b 100644 --- a/src/grp-journal/grp-remote/Makefile +++ b/src/grp-journal/grp-remote/Makefile @@ -31,61 +31,6 @@ ifneq ($(HAVE_ZLIB),) ifneq ($(HAVE_BZIP2),) ifneq ($(HAVE_GCRYPT),) -dist_rootlibexec_DATA = \ - src/import/import-pubring.gpg - -nodist_systemunit_DATA += \ - units/systemd-importd.service - -dist_systemunit_DATA_busnames += \ - units/org.freedesktop.import1.busname - -BUSNAMES_TARGET_WANTS += \ - org.freedesktop.import1.busname - -SYSTEM_UNIT_ALIASES += \ - systemd-importd.service dbus-org.freedesktop.import1.service - -dist_dbussystemservice_DATA += \ - src/import/org.freedesktop.import1.service - -dist_dbuspolicy_DATA += \ - src/import/org.freedesktop.import1.conf - -polkitpolicy_files += \ - src/import/org.freedesktop.import1.policy - -manual_tests += \ - test-qcow2 - -test_qcow2_SOURCES = \ - src/import/test-qcow2.c \ - src/import/qcow2-util.c \ - src/import/qcow2-util.h - -test_qcow2_CFLAGS = \ - $(AM_CFLAGS) \ - $(ZLIB_CFLAGS) - -test_qcow2_LDADD = \ - libshared.la \ - $(ZLIB_LIBS) - -endif # HAVE_GCRYPT -endif # HAVE_BZIP2 -endif # HAVE_ZLIB -endif # HAVE_XZ -endif # HAVE_LIBCURL - -endif # ENABLE_IMPORTD - -polkitpolicy_in_files += \ - src/import/org.freedesktop.import1.policy.in - -EXTRA_DIST += \ - units/systemd-importd.service.in - - nested.subdirs += systemd-journa-gatewayd nested.subdirs += systemd-journa-remote nested.subdirs += systemd-journa-upload diff --git a/src/grp-machine/grp-import/systemd-importd/Makefile b/src/grp-machine/grp-import/systemd-importd/Makefile index 0070c48d05..350b35bf26 100644 --- a/src/grp-machine/grp-import/systemd-importd/Makefile +++ b/src/grp-machine/grp-import/systemd-importd/Makefile @@ -36,4 +36,59 @@ systemd_importd_CFLAGS = \ systemd_importd_LDADD = \ libshared.la +dist_rootlibexec_DATA = \ + src/import/import-pubring.gpg + +nodist_systemunit_DATA += \ + units/systemd-importd.service + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.import1.busname + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.import1.busname + +SYSTEM_UNIT_ALIASES += \ + systemd-importd.service dbus-org.freedesktop.import1.service + +dist_dbussystemservice_DATA += \ + src/import/org.freedesktop.import1.service + +dist_dbuspolicy_DATA += \ + src/import/org.freedesktop.import1.conf + +polkitpolicy_files += \ + src/import/org.freedesktop.import1.policy + +manual_tests += \ + test-qcow2 + +test_qcow2_SOURCES = \ + src/import/test-qcow2.c \ + src/import/qcow2-util.c \ + src/import/qcow2-util.h + +test_qcow2_CFLAGS = \ + $(AM_CFLAGS) \ + $(ZLIB_CFLAGS) + +test_qcow2_LDADD = \ + libshared.la \ + $(ZLIB_LIBS) + +endif # HAVE_GCRYPT +endif # HAVE_BZIP2 +endif # HAVE_ZLIB +endif # HAVE_XZ +endif # HAVE_LIBCURL + +endif # ENABLE_IMPORTD + +polkitpolicy_in_files += \ + src/import/org.freedesktop.import1.policy.in + +EXTRA_DIST += \ + units/systemd-importd.service.in + + include $(topsrcdir)/build-aux/Makefile.tail.mk |