X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fc%2B%2B-rules.make;h=25c1d1207a643b4c5d4eae985d22e499b28b4b6c;hb=1c231128c18b2ac63c293f48ab4b5bc02e92c8ac;hp=fd33d15f9bb1ccd7c0e43f515308bd97acc10f70;hpb=858d0f2c153228aa9088824a89f3dfcb54a3a0a4;p=lilypond.git

diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make
index fd33d15f9b..25c1d1207a 100644
--- a/stepmake/stepmake/c++-rules.make
+++ b/stepmake/stepmake/c++-rules.make
@@ -12,16 +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).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 -t $< > $@
+	$(FLEX) -Cfe -p -p -o$@ $<
+
+$(outdir)/%-rc.o: $(outdir)/%.rc
+	$(WINDRES) $(WINDRES_FLAGS) -o$@ $<