X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fc-rules.make;h=620275baa177e67313535571393c21d85e90e205;hb=a03fa4e3eb5a71fd4ab2f548802d61db54489f0c;hp=a2bf4961879be521f1e93979effbd57be147959c;hpb=a41bc3e06fca46daa875419b5dc00dd958e1fde0;p=lilypond.git

diff --git a/stepmake/stepmake/c-rules.make b/stepmake/stepmake/c-rules.make
index a2bf496187..620275baa1 100644
--- a/stepmake/stepmake/c-rules.make
+++ b/stepmake/stepmake/c-rules.make
@@ -1,26 +1,30 @@
-# stepmake/C_rules.make
-
-.SUFFIXES: .c .o .h .y .l .dep
+.SUFFIXES: .c .dep .h .l .lo .o .so .y
 
 $(outdir)/%.o: %.c
-	$(DO_C_COMPILE)
+	$(DO_O_DEP) $(CC) -c $(ALL_CFLAGS) -o $@ $<
 
 $(outdir)/%.o: $(outdir)/%.c
-	$(DO_C_COMPILE)
+	$(DO_O_DEP) $(CC) -c $(ALL_CFLAGS) -o $@ $<
+
+$(outdir)/%.lo: %.c
+	$(DO_LO_DEP) $(CC) -c $(ALL_CFLAGS) $(PIC_FLAGS) -o $@ $<
+
+$(outdir)/%.lo: %.c
+	$(DO_LO_DEP) $(CC) -c $(ALL_CFLAGS) $(PIC_FLAGS) -o $@ $<
 
 $(outdir)/%.c: %.y
 	$(BISON) $<
-#	mv $<.tab.c $@
-	mv parser.tab.c $@
+	mv $(*F).tab.c $@
 
 $(outdir)/%.h: %.y
 	$(BISON) -d $<
-#	mv $<.tab.h $@
-	mv parser.tab.h $@
-	mv parser.tab.c $(basename $@).c
+	mv $(*F).tab.h $@
+	rm -f $(*F).tab.c # if this happens in the wrong order it triggers recompile of the .cc file
 
 $(outdir)/%.c: %.l
-	$(FLEX) -Cfe -p -p -t $< > $@
+	$(FLEX) -Cfe -p -p -o$@ $<
 # could be faster:
-#	$(FLEX) -8 -Cf -t $< > $@
+#	$(FLEX) -8 -Cf -o$@ $<
 
+$(outdir)/%.rc.o: $(outdir)/%.rc
+	$(WINDRES) $(WINDRES_FLAGS) -o$@ $<