X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fc-rules.make;h=954e7a33a0c306bea99fc77c041e2bd994895bb2;hb=6233e12249f74e19aff5ee5afa66e81c0f8b7259;hp=ef44800783c973000b74b27b0419b5bb287aa62e;hpb=72c67220d22e607b82d2919b71b7de849af6bbeb;p=lilypond.git

diff --git a/stepmake/stepmake/c-rules.make b/stepmake/stepmake/c-rules.make
index ef44800783..954e7a33a0 100644
--- a/stepmake/stepmake/c-rules.make
+++ b/stepmake/stepmake/c-rules.make
@@ -1,30 +1,24 @@
 .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 $@
-
-$(outdir)/%.h: %.y
-	$(BISON) -d $<
-#	mv $<.tab.h $@
-	mv parser.tab.h $@
-	mv parser.tab.c $(basename $@).c
+$(outdir)/%.c $(outdir)/%.h: %.y
+	$(BISON) -d -o $(outdir)/$*.c $<
 
 $(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$@ $<