Makefile: exp/fixup-buggy-yacc-output is no more

[fio.git] / Makefile

diff --git a/Makefile b/Makefile
index 6bdd142dcd0320b72bb9c9bad96c5730e1583651..d735ec7e991dc2cbb745e4b64246b5f275b65d43 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -223,8 +223,10 @@ PROGS += $(T_PROGS)
 ifneq ($(findstring $(MAKEFLAGS),s),s)
 ifndef V
        QUIET_CC        = @echo '   ' CC $@;
-       QUIET_LINK      = @echo '   ' LINK $@;
-       QUIET_DEP       = @echo '   ' DEP $@;
+       QUIET_LINK      = @echo ' ' LINK $@;
+       QUIET_DEP       = @echo '  ' DEP $@;
+       QUIET_YACC      = @echo ' ' YACC $@;
+       QUIET_LEX       = @echo '  ' LEX $@;
 endif
 endif
 
@@ -265,6 +267,9 @@ override CFLAGS += -DFIO_VERSION='"$(FIO_VERSION)"'
        @rm -f $*.d.tmp
 
 ifdef CONFIG_ARITHMETIC
+lex.yy.c: exp/expression-parser.l
+       $(QUIET_LEX)$(LEX) exp/expression-parser.l
+
 lex.yy.o: lex.yy.c y.tab.h
        $(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
 
@@ -272,18 +277,9 @@ y.tab.o: y.tab.c y.tab.h
        $(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
 
 y.tab.c: exp/expression-parser.y
-       $(QUIET_CC)$(YACC) -d exp/expression-parser.y
-
-y.tab.h: y.tab.c exp/fixup-buggy-yacc-output
-       @exp/fixup-buggy-yacc-output $@
+       $(QUIET_YACC)$(YACC) --no-lines -d exp/expression-parser.y
 
-lex.yy.c: exp/expression-parser.l
-       $(QUIET_CC)$(LEX) exp/expression-parser.l
-
-exp/fixup-buggy-yacc-output.o: exp/fixup-buggy-yacc-output.c
-       $(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
-exp/fixup-buggy-yacc-output: exp/fixup-buggy-yacc-output.o
-       $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) $< -o $@
+y.tab.h: y.tab.c
 
 exp/test-expression-parser.o: exp/test-expression-parser.c
        $(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
@@ -330,10 +326,10 @@ t/ieee754: $(T_IEEE_OBJS)
        $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_IEEE_OBJS) $(LIBS)
 
 fio: $(FIO_OBJS)
-       $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(FIO_OBJS) $(PARSER_OBJS) $(LIBS) $(HDFSLIB)
+       $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(FIO_OBJS) $(LIBS) $(HDFSLIB)
 
 gfio: $(GFIO_OBJS)
-       $(QUIET_LINK)$(CC) $(LDFLAGS) -o gfio $(GFIO_OBJS) $(PARSER_OBJS) $(LIBS) $(GTK_LDFLAGS)
+       $(QUIET_LINK)$(CC) $(LDFLAGS) -o gfio $(GFIO_OBJS) $(LIBS) $(GTK_LDFLAGS)
 
 t/genzipf: $(T_ZIPF_OBJS)
        $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_ZIPF_OBJS) $(LIBS)
@@ -353,7 +349,7 @@ t/dedupe: $(T_DEDUPE_OBJS)
        $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_DEDUPE_OBJS) $(LIBS)
 
 clean: FORCE
-       -rm -f .depend $(FIO_OBJS) $(GFIO_OBJS) $(OBJS) $(T_OBJS) $(PROGS) $(T_PROGS) core.* core gfio FIO-VERSION-FILE *.d lib/*.d crc/*.d engines/*.d profiles/*.d t/*.d config-host.mak config-host.h exp/fixup-buggy-yacc-output y.tab.[ch] lex.y.c exp/*.[do]
+       @rm -f .depend $(FIO_OBJS) $(GFIO_OBJS) $(OBJS) $(T_OBJS) $(PROGS) $(T_PROGS) core.* core gfio FIO-VERSION-FILE *.d lib/*.d crc/*.d engines/*.d profiles/*.d t/*.d config-host.mak config-host.h y.tab.[ch] lex.yy.c exp/*.[do]
 
 distclean: clean FORCE
        @rm -f cscope.out fio.pdf fio_generate_plots.pdf fio2gnuplot.pdf