diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-12 11:14:08 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-12 11:14:08 -0400 |
| commit | 3a0d2518184ca975d0cc5a01f7abc6eaf17c3c49 (patch) | |
| tree | 112083fb51418c19e7a63936310ee7a04e23bfed | |
| parent | e6c526b03bfeecdb8af65087e60a658bd36ac80a (diff) | |
have automake2autothing also add depdirs for libraries
| -rw-r--r-- | build-aux/Makefile.each.tail/30-automake2autothing.mk | 12 | ||||
| -rw-r--r-- | src/grp-boot/bootctl/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-machine/libmachine-core/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-machine/nss-mymachines/Makefile | 1 | ||||
| -rw-r--r-- | src/libshared/Makefile | 3 |
5 files changed, 8 insertions, 10 deletions
diff --git a/build-aux/Makefile.each.tail/30-automake2autothing.mk b/build-aux/Makefile.each.tail/30-automake2autothing.mk index 438dd817ef..7091c57d87 100644 --- a/build-aux/Makefile.each.tail/30-automake2autothing.mk +++ b/build-aux/Makefile.each.tail/30-automake2autothing.mk @@ -17,12 +17,16 @@ $(foreach n,$(call automake_name,$(std.out_files)),\ $(eval $n_LIBADD ?=)\ $(eval $n_LDADD ?=)) $(foreach t,$(filter %.la,$(std.out_files)), \ - $(eval $(outdir)/$t: $(call at.path,$(call automake_lo,$t) $(call automake_lib,$t,LIBADD)) )\ + $(eval $t.DEPENDS += $(call at.path,$(call automake_lo,$t) $(call automake_lib,$t,LIBADD)) )\ $(eval am.CPPFLAGS += $($(call automake_name,$t)_CPPFLAGS) $(call automake_cpp,$t,LIBADD) )\ $(eval am.CFLAGS += $($(call automake_name,$t)_CFLAGS) )\ - $(eval am.LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )) + $(eval am.LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )\ + $(eval $(outdir)/$t: $($t.DEPENDS) )\ + $(eval at.depdirs += $(abspath $(sort $(dir $(filter-out -l% /%,$($t.DEPENDS))))) )) $(foreach t,$(bin_PROGRAMS) $(libexec_PROGRAMS), \ - $(eval $(outdir)/$t: $(call at.path,$(call automake_o,$t) $(call automake_lib,$t,LDADD)) )\ + $(eval $t.DEPENDS += $(call at.path,$(call automake_o,$t) $(call automake_lib,$t,LDADD)) )\ $(eval am.CPPFLAGS += $($(call automake_name,$t)_CPPFLAGS) $(call automake_cpp,$t,LDADD) )\ $(eval am.CFLAGS += $($(call automake_name,$t)_CFLAGS) )\ - $(eval am.LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )) + $(eval am.LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )\ + $(eval $(outdir)/$t: $($t.DEPENDS) )\ + $(eval at.depdirs += $(abspath $(sort $(dir $(filter-out -l% /%,$($t.DEPENDS))))) )) diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile index a597f822ad..e44caea1ec 100644 --- a/src/grp-boot/bootctl/Makefile +++ b/src/grp-boot/bootctl/Makefile @@ -52,7 +52,6 @@ dist_zshcompletion_data += \ endif # HAVE_BLKID endif # ENABLE_EFI -at.depdirs += $(topoutdir)/src/libshared systemd.CPPFLAGS += $(libshared.CPPFLAGS) systemd.CPPFLAGS += $(libbasic.CPPFLAGS) diff --git a/src/grp-machine/libmachine-core/Makefile b/src/grp-machine/libmachine-core/Makefile index 884d4e74df..110d6484c7 100644 --- a/src/grp-machine/libmachine-core/Makefile +++ b/src/grp-machine/libmachine-core/Makefile @@ -49,7 +49,6 @@ test_machine_tables_LDADD = \ tests += \ test-machine-tables -at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal systemd.CPPFLAGS += $(libshared.CPPFLAGS) systemd.CPPFLAGS += $(libbasic.CPPFLAGS) systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile index fa281407fb..5042e170e2 100644 --- a/src/grp-machine/nss-mymachines/Makefile +++ b/src/grp-machine/nss-mymachines/Makefile @@ -43,7 +43,6 @@ libnss_mymachines_la_LIBADD = \ lib_LTLIBRARIES += \ libnss_mymachines.la -at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal systemd.CPPFLAGS += $(libbasic.CPPFLAGS) systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus diff --git a/src/libshared/Makefile b/src/libshared/Makefile index 778a6ec0ec..b3d0698ffe 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -148,9 +148,6 @@ test_local_addresses_SOURCES = \ test_local_addresses_LDADD = \ libshared.la -at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal -at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-journal-internal -at.depdirs += $(topoutdir)/src/libudev/src systemd.CPPFLAGS += $(libbasic.CPPFLAGS) systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal |