fix

6 files changed, 18 insertions, 8 deletions

diff --git a/build-aux/Makefile.each.head/00-sd.mk b/build-aux/Makefile.each.head/00-sd.mk
index 0dccebc138..43d1625245 100644
--- a/build-aux/Makefile.each.head/00-sd.mk
+++ b/build-aux/Makefile.each.head/00-sd.mk
@@ -1 +1,6 @@
+sd.CFLAGS ?=
+sd.CPPFLAGS ?=
+sd.LDFLAGS ?=
+sd.LIBTOOLFLAGS ?=
+
 sd.sed_files ?=
diff --git a/build-aux/Makefile.each.tail/50-sd.mk b/build-aux/Makefile.each.tail/50-sd.mk
index 832247ef72..511ce35be8 100644
--- a/build-aux/Makefile.each.tail/50-sd.mk
+++ b/build-aux/Makefile.each.tail/50-sd.mk
@@ -48,7 +48,7 @@ $(addprefix $(outdir)/,$(am.PROGRAMS)): $(outdir)/%:
 	$(AM_V_CCLD)$(sd.LINK) $(lt.link_files)
 
 # Stupid test that everything purported to be exported really is
-$(outdir)/test-lib%-sym.c: lib%.sym
+$(outdir)/test-lib%-sym.c: $(srcdir)/lib%.sym
 	$(AM_V_GEN){\
 		printf '#include <stdio.h>\n' && \
 		printf '#include "%s"\n' $(notdir $(filter %.h, $^)) && \
diff --git a/build-aux/Makefile.each.tail/60-am.mk b/build-aux/Makefile.each.tail/60-am.mk
index 0524dc6ad9..2c0e59212a 100644
--- a/build-aux/Makefile.each.tail/60-am.mk
+++ b/build-aux/Makefile.each.tail/60-am.mk
@@ -7,6 +7,7 @@ $(eval \
   $(foreach f,$(am.LTLIBRARIES),$(call _am.per_LTLIBRARY,$f,$(call am.file2var,$f))$(at.nl))\
   $(foreach d,$(am.inst2dirs)  ,$(call _am.per_directory,$d)$(at.nl)))
 
+at.subdirs += $(am.subdirs)
 files.sys.all += $(foreach p,$(am.primaries),$(am.inst_$p))
 files.out.all += $(foreach p,$(am.primaries),$(am.noinst_$p))
 files.out.all += $(foreach p,$(am.primaries),$(call am.inst2noinst_$p,$(am.inst_$p)))
diff --git a/build-aux/Makefile.once.head/10-files.mk b/build-aux/Makefile.once.head/10-files.mk
index 56e06acc34..2af7bf8f20 100644
--- a/build-aux/Makefile.once.head/10-files.mk
+++ b/build-aux/Makefile.once.head/10-files.mk
@@ -21,7 +21,7 @@ files.default ?= all
 files.vcsclean ?= files.vcsclean
 files.generate ?= files.generate
 
-.DEFAULT_GOAL = $(files.default_group)
+.DEFAULT_GOAL = $(files.default)
 
 # Standard creative PHONY targets
 nested.targets += $(foreach g,$(files.groups), $g install-$g install-$gdirs)
diff --git a/build-aux/Makefile.once.head/20-sd.mk b/build-aux/Makefile.once.head/20-sd.mk
index c8462f285c..6c943978e3 100644
--- a/build-aux/Makefile.once.head/20-sd.mk
+++ b/build-aux/Makefile.once.head/20-sd.mk
@@ -38,10 +38,10 @@ OUR_CPPFLAGS += -include $(topoutdir)/config.h
 OUR_CPPFLAGS += $(sort -I$(@D) $(if $(<D),-I$(<D) -I$(call at.out2src,$(<D))))
 
 # 
-sd.ALL_CFLAGS       = $(OUR_CFLAGS)       $(am.CFLAGS)       $(sd.CFLAGS)       $(CFLAGS)
-sd.ALL_CPPFLAGS     = $(OUR_CPPFLAGS)     $(am.CPPFLAGS)     $(sd.CPPFLAGS)     $(CPPFLAGS)
-sd.ALL_LDFLAGS      = $(OUR_LDFLAGS)      $(am.LDFLAGS)      $(sd.LDFLAGS)      $(LDFLAGS)
-sd.ALL_LIBTOOLFLAGS = $(OUR_LIBTOOLFLAGS) $(am.LIBTOOLFLAGS) $(sd.LIBTOOLFLAGS) $(LIBTOOLFLAGS)
+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_LIBTOOLFLAGS = $(strip $(OUR_LIBTOOLFLAGS)                    $(sd.LIBTOOLFLAGS) $(LIBTOOLFLAGS) )
 
 sd.COMPILE   = $(CC) $(sd.ALL_CPPFLAGS) $(sd.ALL_CFLAGS)
 sd.LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(sd.ALL_LIBTOOLFLAGS) --mode=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 bea6e2aee9..52504c6dcb 100644
--- a/build-aux/Makefile.once.head/30-am.mk
+++ b/build-aux/Makefile.once.head/30-am.mk
@@ -45,7 +45,7 @@ endif
 am.$1 = $$(am.check_$1) $$(am.noinst_$1) $$(call am.inst2noinst_$1,$$(am.inst_$1))
 endef
 ########################################################################
-# TODO: I'm not in love with how _am.per_PROGRAM figures out at.subdirs
+# TODO: I'm not in love with how _am.per_PROGRAM figures out am.subdirs
 # $1 = filename
 # $2 = varname
 define _am.per_PROGRAM
@@ -58,10 +58,12 @@ $$(outdir)/$1: $$(_am.depends)
 am.subdirs := $$(sort $$(am.subdirs)\
                       $$(filter-out $$(abspath $$(srcdir)),\
                                     $$(abspath $$(dir $$(filter-out -l% /%,$$(_am.depends))))))
+am.CPPFLAGS := $$(am.CPPFLAGS)
+am.CFLAGS := $$(am.CFLAGS)
 $(foreach var,_am.depends $(call am.var_LTLIBRARIES,$2),undefine $(var)$(at.nl))
 endef
 ########################################################################
-# TODO: I'm not in love with how _am.per_LTLIBRARY figures out at.subdirs
+# TODO: I'm not in love with how _am.per_LTLIBRARY figures out am.subdirs
 # $1 = filename
 # $2 = varname
 define _am.per_LTLIBRARY
@@ -74,6 +76,8 @@ $$(outdir)/$1: $$(_am.depends)
 am.subdirs := $$(sort $$(am.subdirs)\
                       $$(filter-out $$(abspath $$(srcdir)),\
                                     $$(abspath $$(dir $$(filter-out -l% /%,$$(_am.depends))))))
+am.CPPFLAGS := $$(am.CPPFLAGS)
+am.CFLAGS := $$(am.CFLAGS)
 $(foreach var,_am.depends $(call am.var_LTLIBRARIES,$2),undefine $(var)$(at.nl))
 endef
 ########################################################################