diff options
62 files changed, 222 insertions, 214 deletions
@@ -23,7 +23,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += src +nested.subdirs += src # intltoolize std.gen_files += m4/intltool.m4 diff --git a/Makefile.am b/Makefile.am index 6cc8eaab86..46c6497ffc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -821,7 +821,7 @@ EXTRA_DIST += \ man/glib-event-glue.c #@src/libbasic/Makefile -------------------------------------------------------- -at.subdirs += src include +nested.subdirs += src include #@src/libbasic/src/Makefile noinst_LTLIBRARIES += \ libbasic.la @@ -1041,7 +1041,7 @@ libbasic_la_LIBADD = \ -lm #@src/libshared/Makefile ------------------------------------------------------- -at.subdirs += src +nested.subdirs += src #@src/libshared/src/Makefile noinst_LTLIBRARIES += \ libshared.la @@ -1370,7 +1370,7 @@ CLEANFILES += \ $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@ #@src/libbasic/include/Makefile -at.subdirs += basic +nested.subdirs += basic #@src/libbasic/include/basic/Makefile src/basic/errno-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -3493,7 +3493,7 @@ busctl_LDADD = \ libshared.la #@src/libsystemd-network/Makefile ---------------------------------------------- -at.subdirs += src test +nested.subdirs += src test #@src/libsystemd-network/src/Makefile noinst_LTLIBRARIES += \ libsystemd-network.la @@ -6577,35 +6577,35 @@ add-key: #@src/Makefile #@src/libudev/Makefile -at.subdirs += src +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-boot/Makefile -at.subdirs += bootctl systemd-boot +nested.subdirs += bootctl systemd-boot #@src/grp-coredump/Makefile -at.subdirs += coredumpctl systemd-coredump +nested.subdirs += coredumpctl systemd-coredump #@src/grp-machine/Makefile -at.subdirs += machinectl systemd-machined -at.subdirs += nss-mymachines +nested.subdirs += machinectl systemd-machined +nested.subdirs += nss-mymachines #@src/grp-journal-remote/Makefile -at.subdirs += systemd-journa-gatewayd -at.subdirs += systemd-journa-remote -at.subdirs += systemd-journa-upload +nested.subdirs += systemd-journa-gatewayd +nested.subdirs += systemd-journa-remote +nested.subdirs += systemd-journa-upload #@src/grp-resolve/Makefile -at.subdirs += systemd-resolved nss-resolve +nested.subdirs += systemd-resolved nss-resolve #@src/grp-system/Makefile -at.subdirs += systemctl systemd +nested.subdirs += systemctl systemd #@src/grp-timedate/Makefile -at.subdirs += timedatectl systemd-timedated +nested.subdirs += timedatectl systemd-timedated #@all include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/build-aux/Makefile.each.head/00-sd.mk b/build-aux/Makefile.each.head/00-sd.mk index 0dccebc138..43d1625245 100644 --- a/build-aux/Makefile.each.head/00-sd.mk +++ b/build-aux/Makefile.each.head/00-sd.mk @@ -1 +1,6 @@ +sd.CFLAGS ?= +sd.CPPFLAGS ?= +sd.LDFLAGS ?= +sd.LIBTOOLFLAGS ?= + sd.sed_files ?= diff --git a/build-aux/Makefile.each.tail/50-sd.mk b/build-aux/Makefile.each.tail/50-sd.mk index 832247ef72..511ce35be8 100644 --- a/build-aux/Makefile.each.tail/50-sd.mk +++ b/build-aux/Makefile.each.tail/50-sd.mk @@ -48,7 +48,7 @@ $(addprefix $(outdir)/,$(am.PROGRAMS)): $(outdir)/%: $(AM_V_CCLD)$(sd.LINK) $(lt.link_files) # Stupid test that everything purported to be exported really is -$(outdir)/test-lib%-sym.c: lib%.sym +$(outdir)/test-lib%-sym.c: $(srcdir)/lib%.sym $(AM_V_GEN){\ printf '#include <stdio.h>\n' && \ printf '#include "%s"\n' $(notdir $(filter %.h, $^)) && \ diff --git a/build-aux/Makefile.each.tail/60-am.mk b/build-aux/Makefile.each.tail/60-am.mk index 0524dc6ad9..2c0e59212a 100644 --- a/build-aux/Makefile.each.tail/60-am.mk +++ b/build-aux/Makefile.each.tail/60-am.mk @@ -7,6 +7,7 @@ $(eval \ $(foreach f,$(am.LTLIBRARIES),$(call _am.per_LTLIBRARY,$f,$(call am.file2var,$f))$(at.nl))\ $(foreach d,$(am.inst2dirs) ,$(call _am.per_directory,$d)$(at.nl))) +at.subdirs += $(am.subdirs) files.sys.all += $(foreach p,$(am.primaries),$(am.inst_$p)) files.out.all += $(foreach p,$(am.primaries),$(am.noinst_$p)) files.out.all += $(foreach p,$(am.primaries),$(call am.inst2noinst_$p,$(am.inst_$p))) diff --git a/build-aux/Makefile.once.head/10-files.mk b/build-aux/Makefile.once.head/10-files.mk index 56e06acc34..2af7bf8f20 100644 --- a/build-aux/Makefile.once.head/10-files.mk +++ b/build-aux/Makefile.once.head/10-files.mk @@ -21,7 +21,7 @@ files.default ?= all files.vcsclean ?= files.vcsclean files.generate ?= files.generate -.DEFAULT_GOAL = $(files.default_group) +.DEFAULT_GOAL = $(files.default) # Standard creative PHONY targets nested.targets += $(foreach g,$(files.groups), $g install-$g install-$gdirs) diff --git a/build-aux/Makefile.once.head/20-sd.mk b/build-aux/Makefile.once.head/20-sd.mk index c8462f285c..6c943978e3 100644 --- a/build-aux/Makefile.once.head/20-sd.mk +++ b/build-aux/Makefile.once.head/20-sd.mk @@ -38,10 +38,10 @@ OUR_CPPFLAGS += -include $(topoutdir)/config.h OUR_CPPFLAGS += $(sort -I$(@D) $(if $(<D),-I$(<D) -I$(call at.out2src,$(<D)))) # -sd.ALL_CFLAGS = $(OUR_CFLAGS) $(am.CFLAGS) $(sd.CFLAGS) $(CFLAGS) -sd.ALL_CPPFLAGS = $(OUR_CPPFLAGS) $(am.CPPFLAGS) $(sd.CPPFLAGS) $(CPPFLAGS) -sd.ALL_LDFLAGS = $(OUR_LDFLAGS) $(am.LDFLAGS) $(sd.LDFLAGS) $(LDFLAGS) -sd.ALL_LIBTOOLFLAGS = $(OUR_LIBTOOLFLAGS) $(am.LIBTOOLFLAGS) $(sd.LIBTOOLFLAGS) $(LIBTOOLFLAGS) +sd.ALL_CFLAGS = $(strip $(OUR_CFLAGS) $(am.CFLAGS) $(sd.CFLAGS) $(CFLAGS) ) +sd.ALL_CPPFLAGS = $(strip $(OUR_CPPFLAGS) $(am.CPPFLAGS) $(sd.CPPFLAGS) $(CPPFLAGS) ) +sd.ALL_LDFLAGS = $(strip $(OUR_LDFLAGS) $(sd.LDFLAGS) $(LDFLAGS) ) +sd.ALL_LIBTOOLFLAGS = $(strip $(OUR_LIBTOOLFLAGS) $(sd.LIBTOOLFLAGS) $(LIBTOOLFLAGS) ) sd.COMPILE = $(CC) $(sd.ALL_CPPFLAGS) $(sd.ALL_CFLAGS) sd.LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(sd.ALL_LIBTOOLFLAGS) --mode=compile $(CC) $(sd.ALL_CPPFLAGS) $(sd.ALL_CFLAGS) diff --git a/build-aux/Makefile.once.head/30-am.mk b/build-aux/Makefile.once.head/30-am.mk index bea6e2aee9..52504c6dcb 100644 --- a/build-aux/Makefile.once.head/30-am.mk +++ b/build-aux/Makefile.once.head/30-am.mk @@ -45,7 +45,7 @@ endif am.$1 = $$(am.check_$1) $$(am.noinst_$1) $$(call am.inst2noinst_$1,$$(am.inst_$1)) endef ######################################################################## -# TODO: I'm not in love with how _am.per_PROGRAM figures out at.subdirs +# TODO: I'm not in love with how _am.per_PROGRAM figures out am.subdirs # $1 = filename # $2 = varname define _am.per_PROGRAM @@ -58,10 +58,12 @@ $$(outdir)/$1: $$(_am.depends) am.subdirs := $$(sort $$(am.subdirs)\ $$(filter-out $$(abspath $$(srcdir)),\ $$(abspath $$(dir $$(filter-out -l% /%,$$(_am.depends)))))) +am.CPPFLAGS := $$(am.CPPFLAGS) +am.CFLAGS := $$(am.CFLAGS) $(foreach var,_am.depends $(call am.var_LTLIBRARIES,$2),undefine $(var)$(at.nl)) endef ######################################################################## -# TODO: I'm not in love with how _am.per_LTLIBRARY figures out at.subdirs +# TODO: I'm not in love with how _am.per_LTLIBRARY figures out am.subdirs # $1 = filename # $2 = varname define _am.per_LTLIBRARY @@ -74,6 +76,8 @@ $$(outdir)/$1: $$(_am.depends) am.subdirs := $$(sort $$(am.subdirs)\ $$(filter-out $$(abspath $$(srcdir)),\ $$(abspath $$(dir $$(filter-out -l% /%,$$(_am.depends)))))) +am.CPPFLAGS := $$(am.CPPFLAGS) +am.CFLAGS := $$(am.CFLAGS) $(foreach var,_am.depends $(call am.var_LTLIBRARIES,$2),undefine $(var)$(at.nl)) endef ######################################################################## diff --git a/src/Makefile b/src/Makefile index 6ce1db256f..255851d7d7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -23,50 +23,50 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += busctl -at.subdirs += grp-boot -at.subdirs += grp-coredump -at.subdirs += grp-hostname -at.subdirs += grp-initutils -at.subdirs += grp-journal -at.subdirs += grp-locale -at.subdirs += grp-login -#at.subdirs += grp-machine -at.subdirs += grp-network -at.subdirs += grp-resolve -at.subdirs += grp-system -at.subdirs += grp-timedate -at.subdirs += grp-udev -at.subdirs += grp-utils -at.subdirs += libbasic -at.subdirs += libfirewall -at.subdirs += libshared -at.subdirs += libsystemd -at.subdirs += libsystemd-network -at.subdirs += libudev -at.subdirs += nss-myhostname -at.subdirs += systemd-ask-password -at.subdirs += systemd-cgls -at.subdirs += systemd-cgroups-agent -at.subdirs += systemd-cgtop -at.subdirs += systemd-cryptsetup -at.subdirs += systemd-dbus1-generator -at.subdirs += systemd-debug-generator -at.subdirs += systemd-getty-generator -at.subdirs += systemd-gpt-auto-generator -at.subdirs += systemd-hibernate-resume -at.subdirs += systemd-initctl -at.subdirs += systemd-machine-id-setup -at.subdirs += systemd-modules-load -at.subdirs += systemd-nspawn -at.subdirs += systemd-rc-local-generator -at.subdirs += systemd-remount-fs -at.subdirs += systemd-reply-password -at.subdirs += systemd-shutdown -at.subdirs += systemd-socket-proxyd -at.subdirs += systemd-stdio-bridge -at.subdirs += systemd-system-update-generator -at.subdirs += systemd-timesyncd -at.subdirs += systemd-tty-ask-password-agent +nested.subdirs += busctl +nested.subdirs += grp-boot +nested.subdirs += grp-coredump +nested.subdirs += grp-hostname +nested.subdirs += grp-initutils +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-hibernate-resume +nested.subdirs += systemd-initctl +nested.subdirs += systemd-machine-id-setup +nested.subdirs += systemd-modules-load +nested.subdirs += systemd-nspawn +nested.subdirs += systemd-rc-local-generator +nested.subdirs += systemd-remount-fs +nested.subdirs += systemd-reply-password +nested.subdirs += systemd-shutdown +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 771b80b448..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 -at.subdirs += bootctl systemd-boot kernel-install +nested.subdirs += bootctl systemd-boot kernel-install include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-coredump/Makefile b/src/grp-coredump/Makefile index 2e604d7b86..811efb5af5 100644 --- a/src/grp-coredump/Makefile +++ b/src/grp-coredump/Makefile @@ -23,6 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += coredumpctl systemd-coredump +nested.subdirs += coredumpctl systemd-coredump include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile index f36ccaf6cc..54fe3aeb0e 100644 --- a/src/grp-coredump/systemd-coredump/Makefile +++ b/src/grp-coredump/systemd-coredump/Makefile @@ -78,7 +78,7 @@ EXTRA_DIST += \ sysctl.d/50-coredump.conf.in \ units/systemd-coredump@.service.in -systemd.CPPFLAGS += -I$(topsrcdir)/src/grp-journal/libjournal-core -systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" +sd.CPPFLAGS += -I$(topsrcdir)/src/grp-journal/libjournal-core +sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-initutils/Makefile b/src/grp-initutils/Makefile index 8760b1cd32..0bc22bb42c 100644 --- a/src/grp-initutils/Makefile +++ b/src/grp-initutils/Makefile @@ -23,21 +23,21 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += systemd-backlight -at.subdirs += systemd-binfmt -at.subdirs += systemd-detect-virt -at.subdirs += systemd-firstboot -at.subdirs += systemd-fsck -at.subdirs += systemd-quotacheck -at.subdirs += systemd-random-seed -at.subdirs += systemd-rfkill -at.subdirs += systemd-sleep -at.subdirs += systemd-sysctl -at.subdirs += systemd-sysusers -at.subdirs += systemd-tmpfiles -at.subdirs += systemd-update-done -at.subdirs += systemd-update-utmp -at.subdirs += systemd-user-sessions -at.subdirs += systemd-vconsole-setup +nested.subdirs += systemd-backlight +nested.subdirs += systemd-binfmt +nested.subdirs += systemd-detect-virt +nested.subdirs += systemd-firstboot +nested.subdirs += systemd-fsck +nested.subdirs += systemd-quotacheck +nested.subdirs += systemd-random-seed +nested.subdirs += systemd-rfkill +nested.subdirs += systemd-sleep +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-initutils/systemd-quotacheck/Makefile b/src/grp-initutils/systemd-quotacheck/Makefile index 979ae07c9e..bb3d8dce6b 100644 --- a/src/grp-initutils/systemd-quotacheck/Makefile +++ b/src/grp-initutils/systemd-quotacheck/Makefile @@ -43,6 +43,6 @@ EXTRA_DIST += \ nodist_systemunit_DATA += \ units/quotaon.service -systemd.CPPFLAGS += -DQUOTACHECK=\"$(QUOTACHECK)\" +sd.CPPFLAGS += -DQUOTACHECK=\"$(QUOTACHECK)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-initutils/systemd-random-seed/Makefile b/src/grp-initutils/systemd-random-seed/Makefile index 65ae60828b..489a8ab007 100644 --- a/src/grp-initutils/systemd-random-seed/Makefile +++ b/src/grp-initutils/systemd-random-seed/Makefile @@ -44,7 +44,7 @@ endif # ENABLE_RANDOMSEED EXTRA_DIST += \ units/systemd-random-seed.service.in -systemd.CPPFLAGS += -DRANDOM_SEED_DIR=\"$(localstatedir)/lib/systemd/\" -systemd.CPPFLAGS += -DRANDOM_SEED=\"$(localstatedir)/lib/systemd/random-seed\" +sd.CPPFLAGS += -DRANDOM_SEED_DIR=\"$(localstatedir)/lib/systemd/\" +sd.CPPFLAGS += -DRANDOM_SEED=\"$(localstatedir)/lib/systemd/random-seed\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-initutils/systemd-sleep/Makefile b/src/grp-initutils/systemd-sleep/Makefile index 9ac849f817..6097d09f88 100644 --- a/src/grp-initutils/systemd-sleep/Makefile +++ b/src/grp-initutils/systemd-sleep/Makefile @@ -30,6 +30,6 @@ systemd_sleep_SOURCES = \ systemd_sleep_LDADD = \ libshared.la -systemd.CPPFLAGS += -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" +sd.CPPFLAGS += -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile index 046d93521f..6538713813 100644 --- a/src/grp-journal/Makefile +++ b/src/grp-journal/Makefile @@ -167,8 +167,8 @@ tests += \ test-compress-benchmark endif # HAVE_COMPRESSION -at.subdirs += journalctl systemd-journald libjournal-core -at.subdirs += systemd-cat -#at.subdirs += grp-remote +nested.subdirs += journalctl systemd-journald libjournal-core +nested.subdirs += systemd-cat +#nested.subdirs += grp-remote include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-journal/grp-remote/Makefile b/src/grp-journal/grp-remote/Makefile index 689341d6ae..b1415ad6d3 100644 --- a/src/grp-journal/grp-remote/Makefile +++ b/src/grp-journal/grp-remote/Makefile @@ -23,8 +23,8 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += systemd-journal-gatewayd -at.subdirs += systemd-journal-remote -at.subdirs += systemd-journal-upload +nested.subdirs += systemd-journal-gatewayd +nested.subdirs += systemd-journal-remote +nested.subdirs += systemd-journal-upload include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-journal/journalctl/Makefile b/src/grp-journal/journalctl/Makefile index 7fc5e64143..ce650ae733 100644 --- a/src/grp-journal/journalctl/Makefile +++ b/src/grp-journal/journalctl/Makefile @@ -49,6 +49,6 @@ journalctl_LDADD += \ $(QRENCODE_LIBS) endif # HAVE_QRENCODE -systemd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" +sd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-journal/libjournal-core/Makefile b/src/grp-journal/libjournal-core/Makefile index bcbfd0f8cb..997fcf0468 100644 --- a/src/grp-journal/libjournal-core/Makefile +++ b/src/grp-journal/libjournal-core/Makefile @@ -53,6 +53,6 @@ libjournal_core_la_LIBADD = \ noinst_LTLIBRARIES += \ libjournal-core.la -systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" +sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-locale/Makefile b/src/grp-locale/Makefile index e6ab4a7f48..013c5289a5 100644 --- a/src/grp-locale/Makefile +++ b/src/grp-locale/Makefile @@ -87,7 +87,7 @@ polkitpolicy_in_files += \ EXTRA_DIST += \ units/systemd-localed.service.in -systemd.CPPFLAGS += -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" -systemd.CPPFLAGS += -DSYSTEMD_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\" +sd.CPPFLAGS += -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" +sd.CPPFLAGS += -DSYSTEMD_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile index 15bd8360d0..74a1756ef9 100644 --- a/src/grp-machine/Makefile +++ b/src/grp-machine/Makefile @@ -23,9 +23,9 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += machinectl systemd-machined -at.subdirs += libmachine-core -at.subdirs += nss-mymachines -at.subdirs += grp-import +nested.subdirs += machinectl systemd-machined +nested.subdirs += libmachine-core +nested.subdirs += nss-mymachines +nested.subdirs += grp-import include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-resolve/Makefile b/src/grp-resolve/Makefile index ae0c5a2466..4cea7de4c6 100644 --- a/src/grp-resolve/Makefile +++ b/src/grp-resolve/Makefile @@ -23,6 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += systemd-resolved nss-resolve +nested.subdirs += systemd-resolved nss-resolve include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile index 33b53fedef..8574d3f71a 100644 --- a/src/grp-resolve/systemd-resolved/Makefile +++ b/src/grp-resolve/systemd-resolved/Makefile @@ -223,6 +223,6 @@ EXTRA_DIST += \ $(outdir)/dns-type.o: $(outdir)/dns_type-from-name.h $(outdir)/dns_type-to-name.h -systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" +sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/Makefile b/src/grp-system/Makefile index 3ef4fd8c0e..1f794aa7ad 100644 --- a/src/grp-system/Makefile +++ b/src/grp-system/Makefile @@ -23,7 +23,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += systemctl systemd libcore -at.subdirs += grp-utils +nested.subdirs += systemctl systemd libcore +nested.subdirs += grp-utils include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/grp-utils/Makefile b/src/grp-system/grp-utils/Makefile index 9573b5750c..2c8cc75a7c 100644 --- a/src/grp-system/grp-utils/Makefile +++ b/src/grp-system/grp-utils/Makefile @@ -23,10 +23,10 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += systemd-analyze -at.subdirs += systemd-delta -at.subdirs += systemd-fstab-generator -at.subdirs += systemd-run -at.subdirs += systemd-sysv-generator +nested.subdirs += systemd-analyze +nested.subdirs += systemd-delta +nested.subdirs += systemd-fstab-generator +nested.subdirs += systemd-run +nested.subdirs += systemd-sysv-generator include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/libcore/Makefile b/src/grp-system/libcore/Makefile index a93e1e5be0..1f19355412 100644 --- a/src/grp-system/libcore/Makefile +++ b/src/grp-system/libcore/Makefile @@ -166,10 +166,10 @@ libcore_la_LIBADD = \ $(outdir)/load-fragment-gperf-nulstr.c: $(outdir)/load-fragment-gperf.gperf $(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 ";" }' < $< > $@ -systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src -systemd.CPPFLAGS += -DMOUNT_PATH=\"$(MOUNT_PATH)\" -systemd.CPPFLAGS += -DUMOUNT_PATH=\"$(UMOUNT_PATH)\" -systemd.CPPFLAGS += -DSYSTEMD_CGROUP_AGENT_PATH=\"$(libexecdir)/systemd-cgroups-agent\" -systemd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(libexecdir)/systemd\" +sd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src +sd.CPPFLAGS += -DMOUNT_PATH=\"$(MOUNT_PATH)\" +sd.CPPFLAGS += -DUMOUNT_PATH=\"$(UMOUNT_PATH)\" +sd.CPPFLAGS += -DSYSTEMD_CGROUP_AGENT_PATH=\"$(libexecdir)/systemd-cgroups-agent\" +sd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(libexecdir)/systemd\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/systemctl/Makefile b/src/grp-system/systemctl/Makefile index 43269c66c7..fcd72b00c5 100644 --- a/src/grp-system/systemctl/Makefile +++ b/src/grp-system/systemctl/Makefile @@ -30,8 +30,8 @@ systemctl_SOURCES = \ systemctl_LDADD = \ libshared.la -systemd.CPPFLAGS += -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" -systemd.CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" -systemd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" +sd.CPPFLAGS += -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" +sd.CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" +sd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/systemd/Makefile b/src/grp-system/systemd/Makefile index 8184c85da8..91dca30b92 100644 --- a/src/grp-system/systemd/Makefile +++ b/src/grp-system/systemd/Makefile @@ -68,10 +68,10 @@ dist_systemunit_DATA_busnames += \ BUSNAMES_TARGET_WANTS += \ org.freedesktop.systemd1.busname -systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" +sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" -systemd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" -systemd.CPPFLAGS += -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" -systemd.CPPFLAGS += -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" +sd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" +sd.CPPFLAGS += -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" +sd.CPPFLAGS += -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-timedate/Makefile b/src/grp-timedate/Makefile index bb8be753da..01c4f2f841 100644 --- a/src/grp-timedate/Makefile +++ b/src/grp-timedate/Makefile @@ -23,6 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += timedatectl systemd-timedated +nested.subdirs += timedatectl systemd-timedated include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/Makefile b/src/grp-udev/Makefile index f6c3b1ceb4..67a17d74a0 100644 --- a/src/grp-udev/Makefile +++ b/src/grp-udev/Makefile @@ -69,7 +69,7 @@ SYSINIT_TARGET_WANTS += \ systemd-udevd.service \ systemd-udev-trigger.service -at.subdirs += systemd-udevd udevadm -at.subdirs += ata_id cdrom_id collect mtd_probe scsi_id v4l_id +nested.subdirs += systemd-udevd udevadm +nested.subdirs += ata_id cdrom_id collect mtd_probe scsi_id v4l_id include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile index d47fbe3257..f2b8c88eaf 100644 --- a/src/grp-udev/libudev-core/Makefile +++ b/src/grp-udev/libudev-core/Makefile @@ -27,7 +27,7 @@ noinst_LTLIBRARIES += \ libudev-core.la $(outdir)/keyboard-keys-list.txt: - $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@ + $(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 $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@ @@ -100,8 +100,8 @@ endif # HAVE_ACL libudev-core.la.SOURCES = $(patsubst src/udev/%,%,$(filter %.c,$(_libudev_core_la_SOURCES) $(_nodist_libudev_core_la_SOURCES))) libudev-core.la.DEPENDS = $(addprefix $(outdir)/,$(libudev-core.la.SOURCES:.c=.lo)) -at.subdirs += net +nested.subdirs += net $(outdir)/udev-builtin-keyboard.lo: $(outdir)/keyboard-keys-from-name.h -systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" +sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/libudev-core/net/Makefile b/src/grp-udev/libudev-core/net/Makefile index 153afd5089..5ccbd00002 100644 --- a/src/grp-udev/libudev-core/net/Makefile +++ b/src/grp-udev/libudev-core/net/Makefile @@ -24,7 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -systemd.CPPFLAGS += $(libshared.CPPFLAGS) -systemd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) +sd.CPPFLAGS += $(libshared.CPPFLAGS) +sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/systemd-hwdb/Makefile b/src/grp-udev/systemd-hwdb/Makefile index bf14199ffe..1e5da1d244 100644 --- a/src/grp-udev/systemd-hwdb/Makefile +++ b/src/grp-udev/systemd-hwdb/Makefile @@ -73,6 +73,6 @@ EXTRA_DIST += \ hwdb/ids-update.pl \ hwdb/sdio.ids -systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" +sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/udevadm/Makefile b/src/grp-udev/udevadm/Makefile index ef173b234b..6fa837f6e3 100644 --- a/src/grp-udev/udevadm/Makefile +++ b/src/grp-udev/udevadm/Makefile @@ -42,6 +42,6 @@ udevadm_SOURCES = \ udevadm_LDADD = \ libudev-core.la -systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" +sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-utils/Makefile b/src/grp-utils/Makefile index eda1a32f4b..9d510cf3cc 100644 --- a/src/grp-utils/Makefile +++ b/src/grp-utils/Makefile @@ -23,10 +23,10 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += systemd-ac-power -at.subdirs += systemd-escape -at.subdirs += systemd-notify -at.subdirs += systemd-path -at.subdirs += systemd-socket-activate +nested.subdirs += systemd-ac-power +nested.subdirs += systemd-escape +nested.subdirs += systemd-notify +nested.subdirs += systemd-path +nested.subdirs += systemd-socket-activate include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-utils/systemd-path/Makefile b/src/grp-utils/systemd-path/Makefile index f1a5ccd8bb..9fcae47938 100644 --- a/src/grp-utils/systemd-path/Makefile +++ b/src/grp-utils/systemd-path/Makefile @@ -32,7 +32,7 @@ systemd_path_SOURCES = \ systemd_path_LDADD = \ libbasic.la -systemd.CPPFLAGS += -DLIBDIR=\"$(libdir)\" -systemd.CPPFLAGS += -DROOTLIBDIR=\"$(rootlibdir)\" +sd.CPPFLAGS += -DLIBDIR=\"$(libdir)\" +sd.CPPFLAGS += -DROOTLIBDIR=\"$(rootlibdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libbasic/Makefile b/src/libbasic/Makefile index 45d408fa19..47ce9cf936 100644 --- a/src/libbasic/Makefile +++ b/src/libbasic/Makefile @@ -23,5 +23,5 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += src include +nested.subdirs += src include include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libbasic/include/Makefile b/src/libbasic/include/Makefile index 0aa8325a7e..d3a3e62a0e 100644 --- a/src/libbasic/include/Makefile +++ b/src/libbasic/include/Makefile @@ -23,5 +23,5 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += basic +nested.subdirs += basic include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libbasic/include/basic/Makefile b/src/libbasic/include/basic/Makefile index f371394691..8cebc9cac0 100644 --- a/src/libbasic/include/basic/Makefile +++ b/src/libbasic/include/basic/Makefile @@ -24,21 +24,21 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk $(outdir)/errno-list.txt: | $(outdir)/.deps - $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@ + $(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: - $(AM_V_GEN)$(CPP) $(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; }' >$@ + $(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: - $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@ + $(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 $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const arphrd_names[] = { "} !/CISCO/ { printf "[ARPHRD_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@ @@ -48,7 +48,7 @@ $(outdir)/arphrd-from-name.gperf: $(outdir)/arphrd-list.txt $(outdir)/cap-list.txt: $(srcdir)/missing.h - $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include linux/capability.h -include $< - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@ + $(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include linux/capability.h -include $< - </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 $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@ @@ -59,6 +59,6 @@ $(outdir)/cap-from-name.gperf: $(outdir)/cap-list.txt $(outdir)/cap-from-name.h: $(outdir)/cap-from-name.gperf $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@ -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +sd.CPPFLAGS += $(libbasic.CPPFLAGS) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libbasic/src/Makefile b/src/libbasic/src/Makefile index f29590ae15..19883d92a1 100644 --- a/src/libbasic/src/Makefile +++ b/src/libbasic/src/Makefile @@ -245,6 +245,6 @@ $(outdir)/af-list.lo: $(call _inc,af-from-name.h af-to-name.h) $(outdir)/arphrd-list.lo: $(call _inc,arphrd-from-name.h arphrd-to-name.h) $(outdir)/cap-list.lo: $(call _inc,cap-from-name.h cap-to-name.h) $(outdir)/errno-list.lo: $(call _inc,errno-from-name.h errno-to-name.h) -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +sd.CPPFLAGS += $(libbasic.CPPFLAGS) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile index ebc567cc55..0302964186 100644 --- a/src/libfirewall/Makefile +++ b/src/libfirewall/Makefile @@ -39,6 +39,6 @@ libfirewall_la_LIBADD = \ $(LIBIPTC_LIBS) endif # HAVE_LIBIPTC -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +sd.CPPFLAGS += $(libbasic.CPPFLAGS) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libshared/Makefile b/src/libshared/Makefile index 7ed2706100..d6a307fc5a 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -23,5 +23,5 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += src +nested.subdirs += src include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libshared/src/Makefile b/src/libshared/src/Makefile index 08de6a2ef5..9ac9ba59ac 100644 --- a/src/libshared/src/Makefile +++ b/src/libshared/src/Makefile @@ -139,22 +139,22 @@ libshared_la_LIBADD = \ $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) -systemd.CPPFLAGS += $(addprefix -I,$(call at.path,$(srcdir)/../include $(srcdir)/../include/shared)) -systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" -systemd.CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" -systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" -systemd.CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" -systemd.CPPFLAGS += -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" -systemd.CPPFLAGS += -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" -systemd.CPPFLAGS += -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" +sd.CPPFLAGS += $(addprefix -I,$(call at.path,$(srcdir)/../include $(srcdir)/../include/shared)) +sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" +sd.CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" +sd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" +sd.CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" +sd.CPPFLAGS += -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" +sd.CPPFLAGS += -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" +sd.CPPFLAGS += -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" -systemd.CPPFLAGS += -DSYSTEMD_FSCK_PATH=\"$(libexecdir)/systemd-fsck\" +sd.CPPFLAGS += -DSYSTEMD_FSCK_PATH=\"$(libexecdir)/systemd-fsck\" -systemd.CPPFLAGS += -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(bindir)/systemd-tty-ask-password-agent\" +sd.CPPFLAGS += -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(bindir)/systemd-tty-ask-password-agent\" -systemd.CPPFLAGS += -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" -systemd.CPPFLAGS += -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" +sd.CPPFLAGS += -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" +sd.CPPFLAGS += -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" -systemd.CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" +sd.CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd-network/Makefile b/src/libsystemd-network/Makefile index 96f14f58f2..afd9224056 100644 --- a/src/libsystemd-network/Makefile +++ b/src/libsystemd-network/Makefile @@ -23,5 +23,5 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += src test +nested.subdirs += src test include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd-network/src/Makefile b/src/libsystemd-network/src/Makefile index c228fb6e6f..30afeae1ef 100644 --- a/src/libsystemd-network/src/Makefile +++ b/src/libsystemd-network/src/Makefile @@ -78,8 +78,8 @@ libsystemd_network_la_SOURCES = \ libsystemd_network_la_LIBADD = \ $(KMOD_LIBS) -systemd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) -systemd.CPPFLAGS += $(libshared.CPPFLAGS) -systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src +sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) +sd.CPPFLAGS += $(libshared.CPPFLAGS) +sd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile index 05d928f493..61bf856c96 100644 --- a/src/libsystemd/Makefile +++ b/src/libsystemd/Makefile @@ -32,14 +32,14 @@ EXTRA_DIST += \ src/libsystemd/sd-bus/DIFFERENCES \ src/libsystemd/sd-bus/GVARIANT-SERIALIZATION -_libsystemd_la_SOURCES = \ +#libsystemd_la_SOURCES = \ $(libsystemd_internal_la_SOURCES) \ $(libsystemd_journal_internal_la_SOURCES) -_nodist_libsystemd_la_SOURCES = \ +#nodist_libsystemd_la_SOURCES = \ $(nodist_libsystemd_internal_la_SOURCES) -libsystemd_la_CFLAGS = \ +#libsystemd_la_CFLAGS = \ $(libsystemd_internal_la_CFLAGS) \ $(libsystemd_journal_internal_la_CFLAGS) @@ -48,7 +48,7 @@ libsystemd_la_LDFLAGS = \ -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \ -Wl,--version-script=$(srcdir)/libsystemd.sym -libsystemd_la_LIBADD = \ +#libsystemd_la_LIBADD = \ $(libsystemd_internal_la_LIBADD) \ $(libsystemd_journal_internal_la_LIBADD) @@ -90,17 +90,15 @@ tests += \ test-local-addresses \ test-resolve -test-libsystemd-sym.c: \ - $(top_builddir)/src/libsystemd/libsystemd.sym \ - src/systemd/sd-journal.h \ - src/systemd/sd-daemon.h \ - src/systemd/sd-login.h \ - src/systemd/sd-bus.h \ - src/systemd/sd-utf8.h \ - src/systemd/sd-resolve.h \ - src/systemd/sd-path.h \ - src/systemd/sd-event.h - $(generate-sym-test) +$(outdir)/test-libsystemd-sym.c: \ + $(srcdir)/include/systemd/sd-journal.h \ + $(srcdir)/include/systemd/sd-daemon.h \ + $(srcdir)/include/systemd/sd-login.h \ + $(srcdir)/include/systemd/sd-bus.h \ + $(srcdir)/include/systemd/sd-utf8.h \ + $(srcdir)/include/systemd/sd-resolve.h \ + $(srcdir)/include/systemd/sd-path.h \ + $(srcdir)/include/systemd/sd-event.h nodist_test_libsystemd_sym_SOURCES = \ test-libsystemd-sym.c @@ -108,7 +106,7 @@ test_libsystemd_sym_LDADD = \ libsystemd.la $(outdir)/libsystemd.la: $(srcdir)/libsystemd.sym -at.subdirs += src -systemd.sed_files += libsystemd.pc +nested.subdirs += src +sd.sed_files += libsystemd.pc include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile index 3e30a2377b..759c484bc9 100644 --- a/src/libsystemd/src/Makefile +++ b/src/libsystemd/src/Makefile @@ -331,6 +331,6 @@ libsystemd-internal.la.SOURCES = libsystemd-internal.la.SOURCES += $(patsubst src/libsystemd/%,%,$(filter %.c,$(_libsystemd_internal_la_SOURCES))) libsystemd-internal.la.SOURCES += $(addprefix sd-journal/,$(notdir $(filter %.c,$(_libsystemd_journal_internal_la_SOURCES)))) libsystemd-internal.la.DEPENDS = $(addprefix $(outdir)/,$(libsystemd-internal.la.SOURCES:.c=.lo)) -at.subdirs += $(sort $(dir $(libsystemd-internal.la.SOURCES))) +nested.subdirs += $(sort $(dir $(libsystemd-internal.la.SOURCES))) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/src/sd-journal/Makefile b/src/libsystemd/src/sd-journal/Makefile index 7ecfe2b7c8..c9d5c3dcd8 100644 --- a/src/libsystemd/src/sd-journal/Makefile +++ b/src/libsystemd/src/sd-journal/Makefile @@ -34,8 +34,8 @@ $(outdir)/audit_type-list.txt: $(call at.path,$(topsrcdir)/src/libbasic/include/ $(outdir)/audit_type-to-name.h: $(outdir)/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" }' <$< >$@ -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) -systemd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" +sd.CPPFLAGS += $(libbasic.CPPFLAGS) +sd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" $(outdir)/audit-type.lo: $(outdir)/audit_type-to-name.h include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/src/subdir.mk b/src/libsystemd/src/subdir.mk index 2b0ea2c84f..71691e8dac 100644 --- a/src/libsystemd/src/subdir.mk +++ b/src/libsystemd/src/subdir.mk @@ -24,9 +24,9 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) -systemd.CPPFLAGS += $(libshared.CPPFLAGS) -systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" +sd.CPPFLAGS += $(libsystemd.CPPFLAGS) +sd.CPPFLAGS += $(libbasic.CPPFLAGS) +sd.CPPFLAGS += $(libshared.CPPFLAGS) +sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libudev/Makefile b/src/libudev/Makefile index 05e622117e..2601837e3a 100644 --- a/src/libudev/Makefile +++ b/src/libudev/Makefile @@ -57,8 +57,8 @@ test_libudev_sym_CFLAGS = \ test_libudev_sym_LDADD = \ libudev.la -systemd.sed_files += libudev.pc +sd.sed_files += libudev.pc -at.subdirs += src +nested.subdirs += src include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-cryptsetup/Makefile b/src/systemd-cryptsetup/Makefile index 116ffbc664..981bd89c85 100644 --- a/src/systemd-cryptsetup/Makefile +++ b/src/systemd-cryptsetup/Makefile @@ -56,6 +56,6 @@ SYSINIT_TARGET_WANTS += \ endif # HAVE_LIBCRYPTSETUP -systemd.CPPFLAGS += -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" +sd.CPPFLAGS += -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-dbus1-generator/Makefile b/src/systemd-dbus1-generator/Makefile index a817b954e5..e2c8ca1efc 100644 --- a/src/systemd-dbus1-generator/Makefile +++ b/src/systemd-dbus1-generator/Makefile @@ -46,7 +46,7 @@ dist_xinitrc_SCRIPTS = \ INSTALL_EXEC_HOOKS += dbus1-generator-install-hook UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook -systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" -systemd.CPPFLAGS += -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" +sd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" +sd.CPPFLAGS += -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-debug-generator/Makefile b/src/systemd-debug-generator/Makefile index 6d087d7f37..d07c97f2ef 100644 --- a/src/systemd-debug-generator/Makefile +++ b/src/systemd-debug-generator/Makefile @@ -31,6 +31,6 @@ systemd_debug_generator_SOURCES = \ systemd_debug_generator_LDADD = \ libshared.la -systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" +sd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-getty-generator/Makefile b/src/systemd-getty-generator/Makefile index cfca8e1e1f..9ca689c035 100644 --- a/src/systemd-getty-generator/Makefile +++ b/src/systemd-getty-generator/Makefile @@ -30,6 +30,6 @@ systemd_getty_generator_SOURCES = \ systemd_getty_generator_LDADD = \ libshared.la -systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" +sd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-gpt-auto-generator/Makefile b/src/systemd-gpt-auto-generator/Makefile index 070d62ba83..ef832ad737 100644 --- a/src/systemd-gpt-auto-generator/Makefile +++ b/src/systemd-gpt-auto-generator/Makefile @@ -40,6 +40,6 @@ systemd_gpt_auto_generator_CFLAGS = \ $(BLKID_CFLAGS) endif # HAVE_BLKID -systemd.CPPFLAGS += -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" +sd.CPPFLAGS += -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-hibernate-resume/Makefile b/src/systemd-hibernate-resume/Makefile index 5a8a0b4ad1..1e085e4b28 100644 --- a/src/systemd-hibernate-resume/Makefile +++ b/src/systemd-hibernate-resume/Makefile @@ -57,6 +57,6 @@ EXTRA_DIST += \ units/systemd-hibernate-resume@.service.in \ units/systemd-hybrid-sleep.service.in -systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" +sd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index 8ea5967add..15db3ca3b2 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -82,6 +82,6 @@ test_patch_uid_LDADD = \ manual_tests += \ test-patch-uid -systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src +sd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-remount-fs/Makefile b/src/systemd-remount-fs/Makefile index 29d110625a..a0dcf27135 100644 --- a/src/systemd-remount-fs/Makefile +++ b/src/systemd-remount-fs/Makefile @@ -32,7 +32,7 @@ systemd_remount_fs_SOURCES = \ systemd_remount_fs_LDADD = \ libshared.la -systemd.CPPFLAGS += -DMOUNT_PATH=\"$(MOUNT_PATH)\" -systemd.CPPFLAGS += -DUMOUNT_PATH=\"$(UMOUNT_PATH)\" +sd.CPPFLAGS += -DMOUNT_PATH=\"$(MOUNT_PATH)\" +sd.CPPFLAGS += -DUMOUNT_PATH=\"$(UMOUNT_PATH)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-shutdown/Makefile b/src/systemd-shutdown/Makefile index 1017422b75..ba2dac9e47 100644 --- a/src/systemd-shutdown/Makefile +++ b/src/systemd-shutdown/Makefile @@ -36,7 +36,7 @@ systemd_shutdown_SOURCES = \ systemd_shutdown_LDADD = \ libshared.la -systemd.CPPFLAGS += -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" -systemd.CPPFLAGS += -DKEXEC=\"$(KEXEC)\" +sd.CPPFLAGS += -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" +sd.CPPFLAGS += -DKEXEC=\"$(KEXEC)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-system-update-generator/Makefile b/src/systemd-system-update-generator/Makefile index 535f072fa8..2fa9008ff6 100644 --- a/src/systemd-system-update-generator/Makefile +++ b/src/systemd-system-update-generator/Makefile @@ -30,6 +30,6 @@ systemd_system_update_generator_SOURCES = \ systemd_system_update_generator_LDADD = \ libshared.la -systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" +sd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-timesyncd/Makefile b/src/systemd-timesyncd/Makefile index 50333d0380..2b81fe74fd 100644 --- a/src/systemd-timesyncd/Makefile +++ b/src/systemd-timesyncd/Makefile @@ -61,6 +61,6 @@ EXTRA_DIST += \ units/systemd-timesyncd.service.in \ src/timesync/timesyncd.conf.in -systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" +sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk |