This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 9c9d7b4da56fbac8bd3b1258198026ec6d0d91e2 (commit) from cdf42d8449873a456fd06e7ee2e3f364b1db317b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9c9d7b4da56fbac8bd3b1258198026ec6d0d91e2 Author: Phil Carns <[email protected]> Date: Wed Jan 21 20:54:45 2015 -0500 propagate CFLAGS fixes from John to triton repo ----------------------------------------------------------------------- Summary of changes: code/Make.rules | 8 ++++---- code/maint/depend-ae.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) Diff of changes: diff --git a/code/Make.rules b/code/Make.rules index c20bca5..bc9c96c 100644 --- a/code/Make.rules +++ b/code/Make.rules @@ -15,10 +15,10 @@ tests: $(check_PROGRAMS) # rule for compiling aesop .ae files # .ae.o: - $(AM_V_GEN)$(AECC) -o $@ $< -- $(CFLAGS) + $(AM_V_GEN)$(AECC) -o $@ $< -- $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(AM_CFLAGS) .hae.h: - $(AM_V_GEN)$(AECC) -o $@ $< -j -- $(CFLAGS) + $(AM_V_GEN)$(AECC) -o $@ $< -j -- $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $(AM_CFLAGS) # # rules for .ae dependencies @@ -27,11 +27,11 @@ dirname = $(patsubst %/,%,$(dir $(1))) %.ae.d: %.ae mkdir -p $(call dirname,$@) - $(AM_V_GEN)CC="$(CC)" CFLAGS="$(CFLAGS)" $(srcdir)/maint/depend-ae.sh $(call dirname,$@) $< > $@ + $(AM_V_GEN)CC="$(CC)" CPPFLAGS="$(AM_CPPFLAGS) $(CPPFLAGS)" CFLAGS="$(AM_CFLAGS) $(CFLAGS)" $(srcdir)/maint/depend-ae.sh $(call dirname,$@) $< > $@ %.hae.d: %.hae mkdir -p $(call dirname,$@) - $(AM_V_GEN)CC="$(CC)" CFLAGS="$(CFLAGS)" $(srcdir)/maint/depend-ae.sh $(call dirname,$@) $< > $@ + $(AM_V_GEN)CC="$(CC)" CPPFLAGS="$(AM_CPPFLAGS) $(CPPFLAGS)" CFLAGS="$(AM_CFLAGS) $(CFLAGS)" $(srcdir)/maint/depend-ae.sh $(call dirname,$@) $< > $@ #============================================================================ # Asciidoc rules diff --git a/code/maint/depend-ae.sh b/code/maint/depend-ae.sh index 988b843..70dbdd3 100755 --- a/code/maint/depend-ae.sh +++ b/code/maint/depend-ae.sh @@ -14,4 +14,4 @@ shift if [ -n "$DIR" ] ; then DIR="$DIR"/ fi -exec $CC -x c -M -MM -MG $CFLAGS $1 | sed -e "s@^\(.*\)\.o:@$DIR\1.d $DIR\1.o :@" +exec $CC -x c -M -MM -MG $CPPFLAGS $CFLAGS $1 | sed -e "s@^\(.*\)\.o:@$DIR\1.d $DIR\1.o :@" hooks/post-receive --