From 55eca2e566a7a9f2deb30038b4ca0cbfb6a8de1f Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 19 Apr 2007 10:22:29 +0000 Subject: [PATCH] gst/parse/Makefile.am: Fix the build by correcting the rule that gave wrong files to flex. Original commit message from CVS: * gst/parse/Makefile.am: Fix the build by correcting the rule that gave wrong files to flex. --- ChangeLog | 5 +++++ gst/parse/Makefile.am | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 240006a..b36af02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2007-04-19 Stefan Kost + * gst/parse/Makefile.am: + Fix the build by correcting the rule that gave wrong files to flex. + +2007-04-19 Stefan Kost + * tests/benchmarks/complexity.c: * tests/benchmarks/mass-elements.c: Change licence to LGPL as granted by Benjamin and Andy. diff --git a/gst/parse/Makefile.am b/gst/parse/Makefile.am index 5b1c9b6..2157c6f 100644 --- a/gst/parse/Makefile.am +++ b/gst/parse/Makefile.am @@ -11,12 +11,12 @@ EXTRA_DIST = \ lex._gst_parse_yy.pre.c # uncomment these lines to dist the generated sources -#BUILT_SOURCES = grammar.tab.h grammar.tab.c lex._gst_parse_yy.c +#BUILT_SOURCES = grammar.tab.h grammar.tab.c lex._gst_parse_yy.c #libgstparse_la_SOURCES = lex._gst_parse_yy.c grammar.tab.c # uncomment these lines to _NOT_ dist the generated sources nodist_libgstparse_la_SOURCES = lex._gst_parse_yy.c grammar.tab.c -CLEANFILES += grammar.tab.c lex._gst_parse_yy.c +CLEANFILES += grammar.tab.c lex._gst_parse_yy.c libgstparse_la_CFLAGS = $(GST_ALL_CFLAGS) libgstparse_la_LIBADD = $(GST_ALL_LIBS) @@ -45,14 +45,14 @@ endif lex._gst_parse_yy.pre.c: parse.l grammar.tab.pre.h if GENERATE_PARSER - $(FLEX_PATH) -P_gst_parse_yy lex._gst_parse_yy.c && \ + $(FLEX_PATH) -P_gst_parse_yy $^ && \ mv lex._gst_parse_yy.c lex._gst_parse_yy_tmp.c && \ echo '#ifdef HAVE_CONFIG_H' > lex._gst_parse_yy_tmp2.c && \ echo '#include ' >> lex._gst_parse_yy_tmp2.c && \ echo '#endif' >> lex._gst_parse_yy_tmp2.c && \ cat lex._gst_parse_yy_tmp.c >> lex._gst_parse_yy_tmp2.c && \ rm lex._gst_parse_yy_tmp.c && \ - mv lex._gst_parse_yy_tmp2.c lex._gst_parse_yy.c + mv lex._gst_parse_yy_tmp2.c lex._gst_parse_yy.c && \ cp lex._gst_parse_yy.c lex._gst_parse_yy.pre.c else echo "Timestamp issue on pregenerated flex output." @@ -61,7 +61,7 @@ else endif if GENERATE_PARSER -grammar.tab.c grammar.tab.h: grammar.y +grammar.tab.c grammar.tab.h: grammar.y $(BISON_PATH) -d -v -p_gst_parse_yy $(srcdir)/grammar.y -o grammar.tab.c && \ mv grammar.tab.c grammar.tab_tmp.c && \ echo '#ifdef HAVE_CONFIG_H' > grammar.tab_tmp2.c && \ @@ -75,7 +75,7 @@ grammar.tab.c grammar.tab.h: grammar.tab.pre.c grammar.tab.pre.h cp $(srcdir)/grammar.tab.pre.h grammar.tab.h cp $(srcdir)/grammar.tab.pre.c grammar.tab.c endif - + if GENERATE_PARSER lex._gst_parse_yy.c: parse.l grammar.tab.h $(FLEX_PATH) -P_gst_parse_yy $^ && \ -- 2.7.4