Use a/b diff prefix instead of upstream name and version

[lilypond.git] / stepmake / stepmake / c++-vars.make

diff --git a/stepmake/stepmake/c++-vars.make b/stepmake/stepmake/c++-vars.make
index 955d5d3773e9ce3f4bd36bcc8be647a5edc17cc8..923377ddc4ef55a757c2c92e6455e77b9c39c487 100644 (file)
--- a/stepmake/stepmake/c++-vars.make
+++ b/stepmake/stepmake/c++-vars.make
@@ -6,7 +6,7 @@ EXTRA_CXXFLAGS = -W -Wall -Wconversion
 #EXTRA_CXXFLAGS += -Werror
 #endif
 
-ALL_CXXPPFLAGS = $(DEFINES) $(INCLUDES:%=-I%)
+ALL_CXXPPFLAGS = $(CPPFLAGS) $(CONFIG_CPPFLAGS) $(DEFINES) $(INCLUDES:%=-I%)
 ALL_CXXFLAGS = $(CXXFLAGS) $(ALL_CXXPPFLAGS) $($(PACKAGE)_CXXFLAGS) $(CONFIG_CXXFLAGS) $(MODULE_CXXFLAGS) $(EXTRA_CXXFLAGS)
 
 TCC_FILES := $(call src-wildcard,*.tcc)
@@ -18,7 +18,7 @@ LL_FILES := $(call src-wildcard,*.ll)
 
 SOURCE_FILES+= $(CC_FILES) $(YY_FILES) $(INL_FILES) $(TCC_FILES) $(HH_FILES) $(LL_FILES)
 
-ALL_CC_SOURCES += $(HH_FILES) $(INL_FILES) $(CC_FILES) $(YY_FILES) $(LL_FILES) 
+ALL_CC_SOURCES += $(HH_FILES) $(INL_FILES) $(CC_FILES) $(YY_FILES) $(LL_FILES)
 
 O_FILES+=$(addprefix $(outdir)/, $(CC_FILES:.cc=.o) $(LL_FILES:.ll=.o) $(YY_FILES:.yy=.o))