Imported Upstream version 2.16.0

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

diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make
index 5b80d2447546517b9e0b975040341c7625e4d4a2..a368f4f6669b6e2d223604bce7507c824c4e8f79 100644 (file)
--- a/stepmake/stepmake/c++-rules.make
+++ b/stepmake/stepmake/c++-rules.make
@@ -1,25 +1,27 @@
 .SUFFIXES: .cc .dep .hh .ll .o .so .yy
 
 $(outdir)/%.o: %.cc
-       $(DO_O_DEP) $(CXX) -c $(CXXFLAGS) -o $@ $<
+       $(DO_O_DEP) $(CXX) -c $(ALL_CXXFLAGS) -o $@ $<
 
 $(outdir)/%.o: $(outdir)/%.cc
-       $(DO_O_DEP) $(CXX) -c $(CXXFLAGS) -o $@ $<
+       $(DO_O_DEP) $(CXX) -c $(ALL_CXXFLAGS) -o $@ $<
 
 $(outdir)/%.lo: %.cc
-       $(DO_LO_DEP) $(CXX) -c $(CXXFLAGS) $(PIC_FLAGS) -o $@ $<
+       $(DO_LO_DEP) $(CXX) -c $(ALL_CXXFLAGS) $(PIC_FLAGS) -o $@ $<
 
 $(outdir)/%.lo: $(outdir)/%.cc
-       $(DO_LO_DEP) $(CXX) -c $(CXXFLAGS) $(PIC_FLAGS) -o $@ $<
+       $(DO_LO_DEP) $(CXX) -c $(ALL_CXXFLAGS) $(PIC_FLAGS) -o $@ $<
 
 $(outdir)/%.cc: %.yy
-       $(BISON) $<
-       mv $<.tab.c $@
+       $(BISON) -o $@  $<
 
 $(outdir)/%.hh: %.yy
-       $(BISON) -d $<
-       mv $<.tab.h $@
-       rm $<.tab.c             # if this happens in the wrong order it triggers recompile of the .cc file 
+       $(BISON) -o $(subst .hh,-tmp.cc,$@) -d  $<
+       rm $(subst .hh,-tmp.cc,$@)
+       mv $(subst .hh,-tmp.hh,$@) $@
 
 $(outdir)/%.cc: %.ll
-       $(FLEX) -Cfe -p -p -t $< > $@
+       $(FLEX) -Cfe -p -p -o$@ $<
+
+$(outdir)/%-rc.o: $(outdir)/%.rc
+       $(WINDRES) $(WINDRES_FLAGS) -o$@ $<