Merge branch 'stable/2.16' into staging

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

diff --git a/stepmake/stepmake/c-rules.make b/stepmake/stepmake/c-rules.make
index ef44800783c973000b74b27b0419b5bb287aa62e..620275baa177e67313535571393c21d85e90e205 100644 (file)
--- a/stepmake/stepmake/c-rules.make
+++ b/stepmake/stepmake/c-rules.make
@@ -1,30 +1,30 @@
 .SUFFIXES: .c .dep .h .l .lo .o .so .y
 
 $(outdir)/%.o: %.c
-       $(DO_O_DEP) $(CC) -c $(CFLAGS) -o $@ $<
+       $(DO_O_DEP) $(CC) -c $(ALL_CFLAGS) -o $@ $<
 
 $(outdir)/%.o: $(outdir)/%.c
-       $(DO_O_DEP) $(CC) -c $(CFLAGS) -o $@ $<
+       $(DO_O_DEP) $(CC) -c $(ALL_CFLAGS) -o $@ $<
 
 $(outdir)/%.lo: %.c
-       $(DO_LO_DEP) $(CC) -c $(CFLAGS) $(PIC_FLAGS) -o $@ $<
+       $(DO_LO_DEP) $(CC) -c $(ALL_CFLAGS) $(PIC_FLAGS) -o $@ $<
 
 $(outdir)/%.lo: %.c
-       $(DO_LO_DEP) $(CC) -c $(CFLAGS) $(PIC_FLAGS) -o $@ $<
+       $(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$@ $<