X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fc%2B%2B-rules.make;h=a368f4f6669b6e2d223604bce7507c824c4e8f79;hb=9b5c4a447d35e1f6fcedaf692587c23cc4554a5c;hp=1bec4365b2570ec980bfc343d62fb604314acb6c;hpb=f9efd2c54b174591fa42889557686c7aea356547;p=lilypond.git

diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make
index 1bec4365b2..a368f4f666 100644
--- a/stepmake/stepmake/c++-rules.make
+++ b/stepmake/stepmake/c++-rules.make
@@ -13,15 +13,15 @@ $(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 $@  $<
 
 $(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 $(subst .hh,-tmp.cc,$@) -d  $<
+	rm $(subst .hh,-tmp.cc,$@)
+	mv $(subst .hh,-tmp.hh,$@) $@
 
 $(outdir)/%.cc: %.ll
-	$(FLEX) -Cfe -p -p -t $< > $@
+	$(FLEX) -Cfe -p -p -o$@ $<
+
+$(outdir)/%-rc.o: $(outdir)/%.rc
+	$(WINDRES) $(WINDRES_FLAGS) -o$@ $<