X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fc%2B%2B-rules.make;h=8de00bce07a8c80c06d4362b47a101f60d7db6e8;hb=d6cf41d784ca77fe3b3ea7635a8c48501a152b78;hp=83b54258e0cbcf52fd25be9e72cd88c7de796710;hpb=a41bc3e06fca46daa875419b5dc00dd958e1fde0;p=lilypond.git

diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make
index 83b54258e0..8de00bce07 100644
--- a/stepmake/stepmake/c++-rules.make
+++ b/stepmake/stepmake/c++-rules.make
@@ -1,24 +1,22 @@
-# title	   C++ rules
-# file	   make/C++_rules.make
+.SUFFIXES: .cc .dep .hh .ll .o .so .yy
 
-.SUFFIXES: .cc .o .hh .yy .ll  .dep
-
-# compile rules:
-#
 $(outdir)/%.o: %.cc
-	$(DO_CXX_COMPILE)
+	$(DO_O_DEP) $(CXX) -c $(ALL_CXXFLAGS) -o $@ $<
 
 $(outdir)/%.o: $(outdir)/%.cc
-	$(DO_CXX_COMPILE)
+	$(DO_O_DEP) $(CXX) -c $(ALL_CXXFLAGS) -o $@ $<
+
+$(outdir)/%.lo: %.cc
+	$(DO_LO_DEP) $(CXX) -c $(ALL_CXXFLAGS) $(PIC_FLAGS) -o $@ $<
 
-$(outdir)/%.cc: %.yy
-	$(BISON) $<
-	mv $<.tab.c $@
+$(outdir)/%.lo: $(outdir)/%.cc
+	$(DO_LO_DEP) $(CXX) -c $(ALL_CXXFLAGS) $(PIC_FLAGS) -o $@ $<
 
-$(outdir)/%.hh: %.yy
-	$(BISON) -d $<
-	mv $<.tab.h $@
-	rm $<.tab.c		# if this happens in the wrong order it triggers recompile of the .cc file 
+$(outdir)/%.cc $(outdir)/%.hh: %.yy
+	$(BISON) -d -o $(outdir)/$*.cc $<
 
 $(outdir)/%.cc: %.ll
-	$(FLEX) -Cfe -p -p -t $< > $@
+	$(FLEX) -Cfe -p -p -o$@ $<
+
+$(outdir)/%-rc.o: $(outdir)/%.rc
+	$(WINDRES) $(WINDRES_FLAGS) -o$@ $<