Imported sources

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

diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make
index 1bec4365b2570ec980bfc343d62fb604314acb6c..2f561180c9cab78f8ef653435daa0c6ea0ca8f16 100644 (file)
--- a/stepmake/stepmake/c++-rules.make
+++ b/stepmake/stepmake/c++-rules.make
@@ -13,15 +13,16 @@ $(outdir)/%.lo: $(outdir)/%.cc
        $(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 $@
+       $(BISON) -o $@ $<
+       -mv -f $(*F).yy.tab.c $@ # bison < 1.30
 
 $(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 
+       $(BISON) -o$(outdir)/$(*F).cc -d $<
+       -mv -f $(*F).yy.tab.h $@  # bison < 1.30 ???
+       -mv -f $(outdir)/$(*F).cc.h $@  # bison < 1.30
+       -mv $(*F).tab.hh $@
+       rm -f $(*F).tab.c $(*F).tab.cc # bison < 1.30
+       rm -f $(outdir)/$(*F).cc # avoid recompiling the .cc file 
 
 $(outdir)/%.cc: %.ll
-       $(FLEX) -Cfe -p -p -t $< > $@
+       $(FLEX) -Cfe -p -p -o$@ $<