Merge remote branch 'origin' into release/unstable

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

diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make
index 2f561180c9cab78f8ef653435daa0c6ea0ca8f16..25c1d1207a643b4c5d4eae985d22e499b28b4b6c 100644 (file)
--- a/stepmake/stepmake/c++-rules.make
+++ b/stepmake/stepmake/c++-rules.make
@@ -12,17 +12,11 @@ $(outdir)/%.lo: %.cc
 $(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
-
-$(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 
+$(outdir)/%.cc $(outdir)/%.hh: %.yy
+       $(BISON) -d -o $(subst .hh,.cc,$@)  $<
 
 $(outdir)/%.cc: %.ll
-       $(FLEX) -Cfe -p -p -o$@ $< 
+       $(FLEX) -Cfe -p -p -o$@ $<
+
+$(outdir)/%-rc.o: $(outdir)/%.rc
+       $(WINDRES) $(WINDRES_FLAGS) -o$@ $<