diff options
| -rw-r--r-- | build-aux/Makefile.each.tail/50-sd.mk | 2 | ||||
| -rw-r--r-- | build-aux/Makefile.once.head/10-lt.mk | 2 | ||||
| -rw-r--r-- | build-aux/Makefile.once.head/30-am.mk | 2 | ||||
| -rw-r--r-- | src/libsystemd-shared/src/Makefile | 22 |
4 files changed, 10 insertions, 18 deletions
diff --git a/build-aux/Makefile.each.tail/50-sd.mk b/build-aux/Makefile.each.tail/50-sd.mk index 35b9168570..9917a0ce54 100644 --- a/build-aux/Makefile.each.tail/50-sd.mk +++ b/build-aux/Makefile.each.tail/50-sd.mk @@ -42,10 +42,12 @@ $(outdir)/$(DEPDIR): $(outdir)/%.la: @if test $(words $(lt.lib.files.all)) = 0; then echo 'Cannot link library with no dependencies: $@' >&2; exit 1; fi + @if test $(origin am.LDFLAGS) = undefined; then echo 'Cannot link library with undefined am.LDFLAGS: $@' >&2; exit 1; fi $(AM_V_CCLD)$(sd.LINK) $(if $(lt.lib.rpath),-rpath $(lt.lib.rpath)) $(lt.lib.files.ld) $(AM_V_at)$(lt.lib.post) $(addprefix $(outdir)/,$(am.out_PROGRAMS)): $(outdir)/%: @if test $(words $(lt.exe.files.all)) = 0; then echo 'Cannot link executable with no dependencies: $@' >&2; exit 1; fi + @if test $(origin am.LDFLAGS) = undefined; then echo 'Cannot link executable with undefined am.LDFLAGS: $@' >&2; exit 1; fi $(AM_V_CCLD)$(sd.LINK) $(lt.exe.files.ld) # Stupid test that everything purported to be exported really is diff --git a/build-aux/Makefile.once.head/10-lt.mk b/build-aux/Makefile.once.head/10-lt.mk index 2841bfe214..ea7323b647 100644 --- a/build-aux/Makefile.once.head/10-lt.mk +++ b/build-aux/Makefile.once.head/10-lt.mk @@ -43,7 +43,7 @@ _lt.dedup = $(if $1,$(if $(filter $(firstword $1),$(call _lt.rest,$1)),,$(firstw # Insert a .la library's dependency_libs after the library itself in the list. _lt.dependency_libs = $(foreach _lt.tmp,$1,$(_lt.tmp)$(if $(filter %.la,$(_lt.tmp)), $(shell . $(_lt.tmp); echo $$dependency_libs))) - lt.lib.rpath = $(dir $(filter %/$(@F),$(files.sys)) + lt.lib.rpath = $(dir $(filter %/$(@F),$(files.sys))) lt.lib.files.all = $(filter %.lo %.la -l%,$(call _lt.unLIBPATTERNS,$^)) lt.lib.files.ld = $(strip $(if $(lt.lib.rpath),\ $(lt.lib.files.all),\ diff --git a/build-aux/Makefile.once.head/30-am.mk b/build-aux/Makefile.once.head/30-am.mk index 82c01fbc22..5427e8004d 100644 --- a/build-aux/Makefile.once.head/30-am.mk +++ b/build-aux/Makefile.once.head/30-am.mk @@ -250,7 +250,7 @@ endef # Utility functions _am.sys2dirs = $(sort $(patsubst %/,%,$(dir $(foreach p,$(_am.primaries),$(am.sys_$p))))) -_am.pass3 = $(eval $(foreach d,$(_am.sys2dirs) ,$(call _am.per_directory,$d)$(at.nl))) +_am.pass4 = $(eval $(foreach d,$(_am.sys2dirs) ,$(call _am.per_directory,$d)$(at.nl))) define _am.per_directory $$(DESTDIR)$1/%: $$(outdir)/% @$$(NORMAL_INSTALL) diff --git a/src/libsystemd-shared/src/Makefile b/src/libsystemd-shared/src/Makefile index a8f08e8934..9cbcb79e4a 100644 --- a/src/libsystemd-shared/src/Makefile +++ b/src/libsystemd-shared/src/Makefile @@ -133,30 +133,20 @@ libsystemd_shared_la_CFLAGS = \ $(LIBIDN_CFLAGS) \ $(SECCOMP_CFLAGS) +# We can't use libshared.la here because it would +# pull in libsystemd*-internal.la +# -- Felipe Sateler +# What? We're pulling in libsystemd-internal.la +# anyway! +# -- Luke Shumaker libsystemd_shared_la_LIBADD = \ libsystemd-internal.la \ libsystemd-basic.la \ - libsystemd-journal-internal.la \ libudev-internal.la \ $(ACL_LIBS) \ $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) -libsystemd_shared_la_CFLAGS = \ - $(ACL_CFLAGS) \ - $(LIBIDN_CFLAGS) \ - $(SECCOMP_CFLAGS) \ - -fvisibility=default - -libsystemd_shared_la_LIBADD = \ - $(libsystemd_basic_la_LIBADD) \ - $(libsystemd_internal_la_LIBADD) \ - $(libsystemd_journal_internal_la_LIBADD) \ - $(libudev_internal_la_LIBADD) \ - $(ACL_LIBS) \ - $(LIBIDN_LIBS) \ - $(SECCOMP_LIBS) - libsystemd_shared_la_LDFLAGS = \ -release $(PACKAGE_VERSION) |