From 799fb8a3d138c075bfde710d093350a60b7ee75b Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 10 Aug 2016 22:30:58 -0400
Subject: fix file-specific LDFLAGS

---
 build-aux/Makefile.once.head/20-sd.mk | 2 +-
 build-aux/Makefile.once.head/30-am.mk | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build-aux/Makefile.once.head/20-sd.mk b/build-aux/Makefile.once.head/20-sd.mk
index 6b8dd580cc..7ee0b62ea6 100644
--- a/build-aux/Makefile.once.head/20-sd.mk
+++ b/build-aux/Makefile.once.head/20-sd.mk
@@ -40,7 +40,7 @@ OUR_CPPFLAGS += $(sort -I$(@D) $(if $(<D),-I$(<D) -I$(call at.out2src,$(<D))))
 # 
 sd.ALL_CFLAGS       = $(strip $(OUR_CFLAGS)       $(am.CFLAGS)       $(sd.CFLAGS)       $(CFLAGS)       )
 sd.ALL_CPPFLAGS     = $(strip $(OUR_CPPFLAGS)     $(am.CPPFLAGS)     $(sd.CPPFLAGS)     $(CPPFLAGS)     )
-sd.ALL_LDFLAGS      = $(strip $(OUR_LDFLAGS)                         $(sd.LDFLAGS)      $(LDFLAGS)      )
+sd.ALL_LDFLAGS      = $(strip $(OUR_LDFLAGS)      $(am.LDFLAGS)      $(sd.LDFLAGS)      $(LDFLAGS)      )
 sd.ALL_LIBTOOLFLAGS = $(strip $(OUR_LIBTOOLFLAGS)                    $(sd.LIBTOOLFLAGS) $(LIBTOOLFLAGS) )
 
 sd.COMPILE   = $(CC) $(sd.ALL_CPPFLAGS) $(sd.ALL_CFLAGS)
diff --git a/build-aux/Makefile.once.head/30-am.mk b/build-aux/Makefile.once.head/30-am.mk
index 457a878688..37f16f8652 100644
--- a/build-aux/Makefile.once.head/30-am.mk
+++ b/build-aux/Makefile.once.head/30-am.mk
@@ -20,6 +20,8 @@ am.INSTALL_SCRIPT    ?= $(INSTALL) $< $@
 am.INSTALL_LTLIBRARY ?= $(INSTALL) $< $@
 am.INSTALL_DATA      ?= $(INSTALL_DATA) $< $@
 
+am.LDFLAGS =
+
 ########################################################################
 
 # this list of primaries is based on the Automake 1.15 manual
@@ -58,7 +60,7 @@ $(foreach var,_am.depends $(call am.var_PROGRAMS,$2),$(var) ?=$(at.nl))
 _am.depends += $$(call at.path,$$(call am.file2.o,$1)  $$(call am.file2lib,$1,LDADD))
 am.CPPFLAGS +=                 $$($2_CPPFLAGS)         $$(call am.file2cpp,$1,LDADD)
 am.CFLAGS   +=                 $$($2_CFLAGS)
-$$(outdir)/$1: private ALL_LDFLAGS += $$($2_LDFLAGS)
+$$(outdir)/$1: private am.LDFLAGS := $$($2_LDFLAGS)
 $$(outdir)/$1: $$(_am.depends)
 am.subdirs := $$(sort $$(am.subdirs)\
                       $$(filter-out $$(abspath $$(srcdir)),\
@@ -76,7 +78,7 @@ $(foreach var,_am.depends $(call am.var_LTLIBRARIES,$2),$(var) ?=$(at.nl))
 _am.depends += $$(call at.path,$$(call am.file2.lo,$1) $$(call am.file2lib,$1,LIBADD))
 am.CPPFLAGS +=                 $$($2_CPPFLAGS)         $$(call am.file2cpp,$1,LIBADD)
 am.CFLAGS   +=                 $$($2_CFLAGS)
-$$(outdir)/$1: private ALL_LDFLAGS += $$($2_LDFLAGS)
+$$(outdir)/$1: private am.LDFLAGS := $$($2_LDFLAGS)
 $$(outdir)/$1: $$(_am.depends)
 am.subdirs := $$(sort $$(am.subdirs)\
                       $$(filter-out $$(abspath $$(srcdir)),\
-- 
cgit v1.2.3-54-g00ecf