Keep bison-generated files in sync.

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

diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make
index 1696b2e0aaf1315237d9d3237843a38481709d22..8de00bce07a8c80c06d4362b47a101f60d7db6e8 100644 (file)
--- a/stepmake/stepmake/c++-rules.make
+++ b/stepmake/stepmake/c++-rules.make
@@ -1,27 +1,22 @@
 .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 -f $(*F).yy.tab.c $(*F).tab.cc  # bison < 1.30
-       mv $(*F).tab.cc $@
-
-$(outdir)/%.hh: %.yy
-       $(BISON) -d $<
-       @-mv -f $(*F).yy.tab.h $(*F).tab.hh  # bison < 1.30
-       mv $(*F).tab.hh $@
-       rm -f $(*F).tab.c $(*F).tab.cc  # if this happens in the wrong order it triggers recompile of the .cc file 
+$(outdir)/%.cc $(outdir)/%.hh: %.yy
+       $(BISON) -d -o $(outdir)/$*.cc $<
 
 $(outdir)/%.cc: %.ll
-       $(FLEX) -Cfe -p -p -t $< > $@
+       $(FLEX) -Cfe -p -p -o$@ $<
+
+$(outdir)/%-rc.o: $(outdir)/%.rc
+       $(WINDRES) $(WINDRES_FLAGS) -o$@ $<