diff options
-rw-r--r-- | build-aux/Makefile.each.tail/30-automake2autothing.mk | 27 | ||||
-rw-r--r-- | build-aux/Makefile.each.tail/30-directory-info.mk (renamed from build-aux/Makefile.each.tail/30-module.mk) | 0 | ||||
-rw-r--r-- | build-aux/Makefile.once.head/20-systemd.mk | 49 | ||||
-rw-r--r-- | build-aux/Makefile.once.head/30-automake2autothing.mk | 9 | ||||
-rw-r--r-- | src/busctl/Makefile | 6 | ||||
-rw-r--r-- | src/grp-boot/bootctl/Makefile | 4 | ||||
-rw-r--r-- | src/grp-coredump/coredumpctl/Makefile | 6 | ||||
-rw-r--r-- | src/grp-coredump/systemd-coredump/Makefile | 10 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/Makefile | 8 | ||||
-rw-r--r-- | src/grp-machine/nss-mymachines/Makefile | 4 | ||||
-rw-r--r-- | src/libfirewall/Makefile | 3 | ||||
-rw-r--r-- | src/libshared/Makefile | 32 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/Makefile | 10 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/subdir.mk | 10 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/Makefile | 5 | ||||
-rw-r--r-- | src/libudev/src/Makefile | 10 | ||||
-rw-r--r-- | src/systemd-nspawn/Makefile | 12 | ||||
-rw-r--r-- | src/udev/Makefile | 3 |
18 files changed, 101 insertions, 107 deletions
diff --git a/build-aux/Makefile.each.tail/30-automake2autothing.mk b/build-aux/Makefile.each.tail/30-automake2autothing.mk new file mode 100644 index 0000000000..77320da714 --- /dev/null +++ b/build-aux/Makefile.each.tail/30-automake2autothing.mk @@ -0,0 +1,27 @@ +std.out_files += $(noinst_LTLIBRARIES) $(lib_LTLIBRARIES) +std.sys_files += $(addprefix $(libdir)/,$(lib_LTLIBRARIES)) + +std.out_files += $(bin_PROGRAMS) $(libexec_PROGRAMS) +std.sys_files += $(addprefix $(bindir)/,$(bin_PROGRAMS)) +std.sys_files += $(addprefix $(libexecdir)/,$(libexec_PROGRAMS)) + +std.out_files += $(notdir $(pkgconfiglib_DATA)) +std.sys_files += $(addprefix $(pkgconfiglibdir)/,$(notdir $(lib_pkgconfiglib_DATA))) + +$(foreach n,$(call automake_name,$(std.out_files)),\ + $(eval $n_SOURCES ?=)\ + $(eval nodist_$n_SOURCES ?=)\ + $(eval $n_CFLAGS ?=)\ + $(eval $n_CPPFLAGS ?=)\ + $(eval $n_LDFLAGS ?=)\ + $(eval $n_LIBADD ?=)) +$(foreach t,$(filter %.la,$(std.out_files)),\ + $(eval $(outdir)/$t: $(call at.path,$(call automake_lo,$t) $(call automake_libs,$t)) )\ + $(eval am.CFLAGS += $($(call automake_name,$t)_CFLAGS) )\ + $(eval am.CPPFLAGS += $($(call automake_name,$t)_CPPFLAGS) )\ + $(eval am.LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )) +$(foreach t,$(bin_PROGRAMS) $(libexec_PROGRAMS),\ + $(eval $(outdir)/$t: $(call at.path,$(call automake_o,$t) $(call automake_libs,$t)) )\ + $(eval am.CFLAGS += $($(call automake_name,$t)_CFLAGS) )\ + $(eval am.CPPFLAGS += $($(call automake_name,$t)_CPPFLAGS) )\ + $(eval am.LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )) diff --git a/build-aux/Makefile.each.tail/30-module.mk b/build-aux/Makefile.each.tail/30-directory-info.mk index 10ebc4c1de..10ebc4c1de 100644 --- a/build-aux/Makefile.each.tail/30-module.mk +++ b/build-aux/Makefile.each.tail/30-directory-info.mk diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk index 61484c2954..6f9d23dc5a 100644 --- a/build-aux/Makefile.once.head/20-systemd.mk +++ b/build-aux/Makefile.once.head/20-systemd.mk @@ -27,11 +27,11 @@ OUR_CPPFLAGS += -MT $@ -MD -MP -MF $(@D)/$(DEPDIR)/$(basename $(@F)).P$(patsubst OUR_CPPFLAGS += -include $(topoutdir)/config.h OUR_CPPFLAGS += $(if $(<D),-I$(<D)) -I$(@D) -at.dirlocal += AM_CFLAGS AM_CPPFLAGS AM_LDFLAGS AM_LIBTOOLFLAGS -ALL_CFLAGS = $(OUR_CFLAGS) $(AM_CFLAGS/$(@D)) $(CFLAGS) -ALL_CPPFLAGS = $(OUR_CPPFLAGS) $(AM_CPPFLAGS/$(@D)) $(CPPFLAGS) -ALL_LDFLAGS = $(OUR_LDFLAGS) $(AM_LDFLAGS/$(@D)) $(LDFLAGS) -ALL_LIBTOOLFLAGS = $(OUR_LIBTOOLFLAGS) $(AM_LIBTOOLFLAGS/$(@D)) $(LIBTOOLFLAGS) +at.dirlocal += systemd.CFLAGS systemd.CPPFLAGS systemd.LDFLAGS systemd.LIBTOOLFLAGS +ALL_CFLAGS = $(OUR_CFLAGS) $(am.CFLAGS/$(@D)) $(systemd.CFLAGS/$(@D)) $(CFLAGS) +ALL_CPPFLAGS = $(OUR_CPPFLAGS) $(am.CPPFLAGS/$(@D)) $(systemd.CPPFLAGS/$(@D)) $(CPPFLAGS) +ALL_LDFLAGS = $(OUR_LDFLAGS) $(am.LDFLAGS/$(@D)) $(systemd.LDFLAGS/$(@D)) $(LDFLAGS) +ALL_LIBTOOLFLAGS = $(OUR_LIBTOOLFLAGS) $(am.LIBTOOLFLAGS/$(@D)) $(systemd.LIBTOOLFLAGS/$(@D)) $(LIBTOOLFLAGS) COMPILE = $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(ALL_LIBTOOLFLAGS) --mode=compile $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) @@ -192,42 +192,3 @@ define generate-sym-test endef at.dirlocal += systemd.sed_files - -at.dirlocal += noinst_LTLIBRARIES lib_LTLIBRARIES -at.dirlocal += bin_PROGRAMS libexec_PROGRAMS -at.dirlocal += pkgconfiglib_DATA -automake_name = $(subst -,_,$(subst .,_,$1)) -automake_sources = $(addprefix $(outdir)/,$(notdir $($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES))) -automake_lo = $(patsubst %.c,%.lo,$(filter %.c,$(automake_sources))) -automake_o = $(patsubst %.c,%.o,$(filter %.c,$(automake_sources))) -automake_libs = $($(automake_name)_LIBADD) $($(automake_name)_LDADD) - -define automake2autothing -std.out_files += $(noinst_LTLIBRARIES) $(lib_LTLIBRARIES) -std.sys_files += $(addprefix $(libdir)/,$(lib_LTLIBRARIES)) - -std.out_files += $(bin_PROGRAMS) $(libexec_PROGRAMS) -std.sys_files += $(addprefix $(bindir)/,$(bin_PROGRAMS)) -std.sys_files += $(addprefix $(libexecdir)/,$(libexec_PROGRAMS)) - -std.out_files += $(notdir $(pkgconfiglib_DATA)) -std.sys_files += $(addprefix $(pkgconfiglibdir)/,$(notdir $(lib_pkgconfiglib_DATA))) - -$(foreach n,$(call automake_name,$(std.out_files)),\ - $(eval $n_SOURCES ?=)\ - $(eval nodist_$n_SOURCES ?=)\ - $(eval $n_CFLAGS ?=)\ - $(eval $n_CPPFLAGS ?=)\ - $(eval $n_LDFLAGS ?=)\ - $(eval $n_LIBADD ?=)) -$(foreach t,$(filter %.la,$(std.out_files)),\ - $(eval $(outdir)/$t: $(call at.path,$(call automake_lo,$t) $(call automake_libs,$t)) )\ - $(eval AM_CFLAGS += $($(call automake_name,$t)_CFLAGS) )\ - $(eval AM_CPPFLAGS += $($(call automake_name,$t)_CPPFLAGS) )\ - $(eval AM_LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )) -$(foreach t,$(bin_PROGRAMS) $(libexec_PROGRAMS),\ - $(eval $(outdir)/$t: $(call at.path,$(call automake_o,$t) $(call automake_libs,$t)) )\ - $(eval AM_CFLAGS += $($(call automake_name,$t)_CFLAGS) )\ - $(eval AM_CPPFLAGS += $($(call automake_name,$t)_CPPFLAGS) )\ - $(eval AM_LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )) -endef diff --git a/build-aux/Makefile.once.head/30-automake2autothing.mk b/build-aux/Makefile.once.head/30-automake2autothing.mk new file mode 100644 index 0000000000..a1df4e2518 --- /dev/null +++ b/build-aux/Makefile.once.head/30-automake2autothing.mk @@ -0,0 +1,9 @@ +at.dirlocal += am.CFLAGS am.CPPFLAGS am.LDFLAGS am.LIBTOOLFLAGS +at.dirlocal += noinst_LTLIBRARIES lib_LTLIBRARIES +at.dirlocal += bin_PROGRAMS libexec_PROGRAMS +at.dirlocal += pkgconfiglib_DATA +automake_name = $(subst -,_,$(subst .,_,$1)) +automake_sources = $(addprefix $(outdir)/,$(notdir $($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES))) +automake_lo = $(patsubst %.c,%.lo,$(filter %.c,$(automake_sources))) +automake_o = $(patsubst %.c,%.o,$(filter %.c,$(automake_sources))) +automake_libs = $($(automake_name)_LIBADD) $($(automake_name)_LDADD) diff --git a/src/busctl/Makefile b/src/busctl/Makefile index 261486555d..43b50b6296 100644 --- a/src/busctl/Makefile +++ b/src/busctl/Makefile @@ -35,7 +35,7 @@ busctl_LDADD = \ $(topoutdir)/src/libshared/libshared.la $(eval $(value automake2autothing)) -AM_CPPFLAGS += $(libshared.CPPFLAGS) -AM_CPPFLAGS += $(libbasic.CPPFLAGS) -AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus +systemd.CPPFLAGS += $(libshared.CPPFLAGS) +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile index 39a4af1442..0f927b0564 100644 --- a/src/grp-boot/bootctl/Makefile +++ b/src/grp-boot/bootctl/Makefile @@ -54,7 +54,7 @@ endif # ENABLE_EFI $(eval $(value automake2autothing)) at.depdirs += $(topoutdir)/src/libshared -AM_CPPFLAGS += $(libshared.CPPFLAGS) -AM_CPPFLAGS += $(libbasic.CPPFLAGS) +systemd.CPPFLAGS += $(libshared.CPPFLAGS) +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-coredump/coredumpctl/Makefile b/src/grp-coredump/coredumpctl/Makefile index ca992c9850..d1dfc6f0ee 100644 --- a/src/grp-coredump/coredumpctl/Makefile +++ b/src/grp-coredump/coredumpctl/Makefile @@ -39,7 +39,7 @@ dist_zshcompletion_data += \ shell-completion/zsh/_coredumpctl $(eval $(value automake2autothing)) -AM_CPPFLAGS += $(libbasic.CPPFLAGS) -AM_CPPFLAGS += $(libshared.CPPFLAGS) -AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +systemd.CPPFLAGS += $(libshared.CPPFLAGS) +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile index 9d7d931a46..dbc39e66c1 100644 --- a/src/grp-coredump/systemd-coredump/Makefile +++ b/src/grp-coredump/systemd-coredump/Makefile @@ -79,9 +79,9 @@ EXTRA_DIST += \ units/systemd-coredump@.service.in $(eval $(value automake2autothing)) -AM_CPPFLAGS += $(libbasic.CPPFLAGS) -AM_CPPFLAGS += $(libshared.CPPFLAGS) -AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal -AM_CPPFLAGS += -I$(topsrcdir)/src/journal -AM_CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +systemd.CPPFLAGS += $(libshared.CPPFLAGS) +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal +systemd.CPPFLAGS += -I$(topsrcdir)/src/journal +systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/libmachine-core/Makefile b/src/grp-machine/libmachine-core/Makefile index b41a1d77e8..c2b4ea3b50 100644 --- a/src/grp-machine/libmachine-core/Makefile +++ b/src/grp-machine/libmachine-core/Makefile @@ -49,8 +49,8 @@ tests += \ $(eval $(value automake2autothing)) at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal -AM_CPPFLAGS += $(libshared.CPPFLAGS) -AM_CPPFLAGS += $(libbasic.CPPFLAGS) -AM_CPPFLAGS += $(libsystemd.CPPFLAGS) -AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus +systemd.CPPFLAGS += $(libshared.CPPFLAGS) +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile index 9e06a5e767..cd199d39c0 100644 --- a/src/grp-machine/nss-mymachines/Makefile +++ b/src/grp-machine/nss-mymachines/Makefile @@ -45,6 +45,6 @@ lib_LTLIBRARIES += \ $(eval $(value automake2autothing)) at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal -AM_CPPFLAGS += $(libbasic.CPPFLAGS) -AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile index 7ddfc7d288..6df4908c21 100644 --- a/src/libfirewall/Makefile +++ b/src/libfirewall/Makefile @@ -40,6 +40,5 @@ libfirewall_la_LIBADD = \ endif # HAVE_LIBIPTC $(eval $(value automake2autothing)) -AM_CPPFLAGS += $(libbasic.CPPFLAGS) - +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libshared/Makefile b/src/libshared/Makefile index 4e05381339..9d4a2b4c21 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -149,26 +149,26 @@ $(eval $(value automake2autothing)) at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-journal-internal at.depdirs += $(topoutdir)/src/libudev/src -AM_CPPFLAGS += $(libbasic.CPPFLAGS) -AM_CPPFLAGS += $(libsystemd.CPPFLAGS) -AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal -AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus -AM_CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" -AM_CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" -AM_CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" -AM_CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" -AM_CPPFLAGS += -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" -AM_CPPFLAGS += -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" -AM_CPPFLAGS += -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" +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)\" -AM_CPPFLAGS += -DSYSTEMD_FSCK_PATH=\"$(rootlibexecdir)/systemd-fsck\" +systemd.CPPFLAGS += -DSYSTEMD_FSCK_PATH=\"$(rootlibexecdir)/systemd-fsck\" -AM_CPPFLAGS += -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" +systemd.CPPFLAGS += -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" -AM_CPPFLAGS += -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" -AM_CPPFLAGS += -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" +systemd.CPPFLAGS += -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" +systemd.CPPFLAGS += -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" -AM_CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" +systemd.CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile index 76818c80cf..5ac7825bd0 100644 --- a/src/libsystemd/libsystemd-internal/Makefile +++ b/src/libsystemd/libsystemd-internal/Makefile @@ -256,10 +256,10 @@ automake_sources = $(addprefix $(outdir)/,$(notdir $($(automake_name)_SOURCES) $ at.subdirs += $(_subdirs) at.depdirs += $(topoutdir)/src/libbasic -AM_CPPFLAGS += $(libsystemd.CPPFLAGS) -AM_CPPFLAGS += $(libbasic.CPPFLAGS) -AM_CPPFLAGS += $(libshared.CPPFLAGS) -AM_CPPFLAGS += -DLIBDIR=\"$(libdir)\" -AM_CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" +systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +systemd.CPPFLAGS += $(libshared.CPPFLAGS) +systemd.CPPFLAGS += -DLIBDIR=\"$(libdir)\" +systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/libsystemd-internal/subdir.mk b/src/libsystemd/libsystemd-internal/subdir.mk index 96b7145434..9ec814aa70 100644 --- a/src/libsystemd/libsystemd-internal/subdir.mk +++ b/src/libsystemd/libsystemd-internal/subdir.mk @@ -1,10 +1,10 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -AM_CPPFLAGS += $(libsystemd.CPPFLAGS) -AM_CPPFLAGS += $(libbasic.CPPFLAGS) -AM_CPPFLAGS += $(libshared.CPPFLAGS) -AM_CPPFLAGS += -DLIBDIR=\"$(libdir)\" -AM_CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" +systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +systemd.CPPFLAGS += $(libshared.CPPFLAGS) +systemd.CPPFLAGS += -DLIBDIR=\"$(libdir)\" +systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/libsystemd-journal-internal/Makefile b/src/libsystemd/libsystemd-journal-internal/Makefile index 6d0be9edff..a645ac5cff 100644 --- a/src/libsystemd/libsystemd-journal-internal/Makefile +++ b/src/libsystemd/libsystemd-journal-internal/Makefile @@ -110,8 +110,7 @@ noinst_LTLIBRARIES += \ libsystemd-journal-internal.la $(eval $(value automake2autothing)) -AM_CPPFLAGS += $(libbasic.CPPFLAGS) -AM_CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +systemd.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/libudev/src/Makefile b/src/libudev/src/Makefile index d36fa93e0e..29651d9311 100644 --- a/src/libudev/src/Makefile +++ b/src/libudev/src/Makefile @@ -76,10 +76,10 @@ test_libudev_sym_LDADD = \ $(eval $(value automake2autothing)) systemd.sed_files += libudev.pc -AM_CPPFLAGS += $(libbasic.CPPFLAGS) -AM_CPPFLAGS += $(libsystemd.CPPFLAGS) -AM_CPPFLAGS += $(libsystemd.CPPFLAGS) -AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-device -AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) +systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-device +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index 4c7606494f..778afb8dc8 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -53,7 +53,7 @@ gperf_gperf_sources += \ src/nspawn/nspawn-gperf.gperf systemd_nspawn_CFLAGS = \ - $(AM_CFLAGS) \ + $(systemd.CFLAGS) \ $(BLKID_CFLAGS) \ $(SECCOMP_CFLAGS) @@ -69,11 +69,11 @@ endif # HAVE_LIBIPTC bin_PROGRAMS += systemd-nspawn $(eval $(value automake2autothing)) at.depdirs += $(topoutdir)/src/libshared $(if $(HAVE_LIBIPTC),$(topoutdir)/src/libfirewall) -AM_CPPFLAGS += $(libshared.CPPFLAGS) $(if $(HAVE_LIBIPTC),$(libfirewall.CPPFLAGS)) +systemd.CPPFLAGS += $(libshared.CPPFLAGS) $(if $(HAVE_LIBIPTC),$(libfirewall.CPPFLAGS)) -AM_CPPFLAGS += $(libbasic.CPPFLAGS) -AM_CPPFLAGS += $(libsystemd.CPPFLAGS) -AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus -AM_CPPFLAGS += -I$(topsrcdir)/src/libudev/src +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus +systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/udev/Makefile b/src/udev/Makefile index 187712f651..b355ac8726 100644 --- a/src/udev/Makefile +++ b/src/udev/Makefile @@ -84,8 +84,7 @@ noinst_LTLIBRARIES += \ libudev-core.la $(outdir)/keyboard-keys-list.txt: - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@ + $(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 } }' > $@ $(outdir)/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@ |