diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 02:50:07 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 02:50:07 -0400 |
commit | 590eca26c13f4d704b2fc614e7ef49b600e6b5e0 (patch) | |
tree | 0ce57d70ead69a55809c631d605d4fd2b6c853ef /src/libsystemd/libsystemd-internal | |
parent | d10902f55ae7aed2eeffedcd29d8ced80ec903ba (diff) | |
parent | f0c56a8635949d284e6fb61e04d07e9a8e2b429b (diff) |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# build-aux/Makefile.each.tail/20-systemd.mk
# build-aux/Makefile.once.head/20-systemd.mk
# build-aux/Makefile.once.tail/20-systemd.mk
# config.mk.in
# src/busctl/Makefile
# src/grp-boot/bootctl/Makefile
# src/grp-boot/systemd-boot/Makefile
# src/grp-coredump/coredumpctl/Makefile
# src/grp-coredump/systemd-coredump/Makefile
# src/grp-machine/libmachine-core/Makefile
# src/grp-machine/nss-mymachines/Makefile
# src/libbasic/Makefile
# src/libfirewall/Makefile
# src/libshared/Makefile
# src/libsystemd/Makefile
# src/libsystemd/libsystemd-internal/Makefile
# src/libsystemd/libsystemd-journal-internal/Makefile
# src/libudev/src/Makefile
# src/systemd-nspawn/Makefile
Diffstat (limited to 'src/libsystemd/libsystemd-internal')
-rw-r--r-- | src/libsystemd/libsystemd-internal/Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile index 5ac7825bd0..d71aa9416d 100644 --- a/src/libsystemd/libsystemd-internal/Makefile +++ b/src/libsystemd/libsystemd-internal/Makefile @@ -248,12 +248,7 @@ test_resolve_SOURCES = \ test_resolve_LDADD = \ libshared.la -automake_sources = $(patsubst src/libsystemd/%,$(outdir)/%,$(filter %.c,$($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES))) -$(eval $(value automake2autothing)) -_subdirs := $(notdir $(patsubst %/,%,$(dir $(call automake_sources,libsystemd-internal.la)))) -automake_sources = $(addprefix $(outdir)/,$(notdir $($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES))) - -at.subdirs += $(_subdirs) +at.subdirs += $(notdir $(patsubst %/,%,$(dir $(call automake_sources,libsystemd-internal.la)))) at.depdirs += $(topoutdir)/src/libbasic systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) |