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 2e1578c1774f670e335e58e5f56a9b3182b2526e..a368f4f6669b6e2d223604bce7507c824c4e8f79 100644 (file)
--- a/stepmake/stepmake/c++-rules.make
+++ b/stepmake/stepmake/c++-rules.make
@@ -13,16 +13,12 @@ $(outdir)/%.lo: $(outdir)/%.cc
        $(DO_LO_DEP) $(CXX) -c $(ALL_CXXFLAGS) $(PIC_FLAGS) -o $@ $<
 
 $(outdir)/%.cc: %.yy
-       $(BISON) -o $@ $<
-       -mv -f $(*F).yy.tab.c $@ # bison < 1.30
+       $(BISON) -o $@  $<
 
 $(outdir)/%.hh: %.yy
-       $(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
+       $(BISON) -o $(subst .hh,-tmp.cc,$@) -d  $<
+       rm $(subst .hh,-tmp.cc,$@)
+       mv $(subst .hh,-tmp.hh,$@) $@
 
 $(outdir)/%.cc: %.ll
        $(FLEX) -Cfe -p -p -o$@ $<