diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-09 02:17:22 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-09 02:17:22 -0400 |
| commit | 23708daf3ba69ba9880102b4f720a3842883332e (patch) | |
| tree | d667fcd764ee137ea6a3275db664d88ee64c22a7 /build-aux | |
| parent | edb237129437a0ccace5bfac0ffa0a109748f7b9 (diff) | |
stuff
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/Makefile.each.tail/20-systemd.mk | 9 | ||||
| -rw-r--r-- | build-aux/Makefile.each.tail/30-automake2autothing.mk | 23 | ||||
| -rw-r--r-- | build-aux/Makefile.once.head/30-automake2autothing.mk | 3 |
3 files changed, 18 insertions, 17 deletions
diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk index 0d05832fc3..0369b59bcf 100644 --- a/build-aux/Makefile.each.tail/20-systemd.mk +++ b/build-aux/Makefile.each.tail/20-systemd.mk @@ -29,11 +29,10 @@ std.clean_files += *-from-name.gperf std.clean_files += *-from-name.h std.clean_files += *-to-name.h -$(outdir)/%.o: $(srcdir)/%.c $(topoutdir)/config.h | $(outdir)/.deps - $(AM_V_CC)$(COMPILE) -c -o $@ $< - -$(outdir)/%.lo: $(srcdir)/%.c $(topoutdir)/config.h | $(outdir)/.deps - $(AM_V_CC)$(LTCOMPILE) -c -o $@ $< +$(outdir)/%.o : $(srcdir)/%.c $(topoutdir)/config.h | $(outdir)/.deps; $(AM_V_CC)$(COMPILE) -c -o $@ $< +$(outdir)/%.o : $(outdir)/%.c $(topoutdir)/config.h | $(outdir)/.deps; $(AM_V_CC)$(COMPILE) -c -o $@ $< +$(outdir)/%.lo: $(srcdir)/%.c $(topoutdir)/config.h | $(outdir)/.deps; $(AM_V_CC)$(LTCOMPILE) -c -o $@ $< +$(outdir)/%.lo: $(outdir)/%.c $(topoutdir)/config.h | $(outdir)/.deps; $(AM_V_CC)$(LTCOMPILE) -c -o $@ $< $(outdir)/.deps: $(AM_V_at)$(MKDIR_P) $@ diff --git a/build-aux/Makefile.each.tail/30-automake2autothing.mk b/build-aux/Makefile.each.tail/30-automake2autothing.mk index 77320da714..438dd817ef 100644 --- a/build-aux/Makefile.each.tail/30-automake2autothing.mk +++ b/build-aux/Makefile.each.tail/30-automake2autothing.mk @@ -14,14 +14,15 @@ $(foreach n,$(call automake_name,$(std.out_files)),\ $(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) )) + $(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 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) )) +$(foreach t,$(bin_PROGRAMS) $(libexec_PROGRAMS), \ + $(eval $(outdir)/$t: $(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) )) diff --git a/build-aux/Makefile.once.head/30-automake2autothing.mk b/build-aux/Makefile.once.head/30-automake2autothing.mk index a1df4e2518..9b05224d1c 100644 --- a/build-aux/Makefile.once.head/30-automake2autothing.mk +++ b/build-aux/Makefile.once.head/30-automake2autothing.mk @@ -6,4 +6,5 @@ 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) +automake_lib = $(foreach l,$($(automake_name)_$2),$(if $(filter lib%.la,$l), $($(l:.la=).DEPENDS) , $l )) +automake_cpp = $(foreach l,$($(automake_name)_$2),$(if $(filter lib%.la,$l), $($(l:.la=).CPPFLAGS) , )) |