Index: gst/parse/Makefile.am =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/parse/Makefile.am,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- gst/parse/Makefile.am 15 Dec 2003 22:13:03 -0000 1.26 +++ gst/parse/Makefile.am 19 Dec 2003 20:27:03 -0000 1.27 @@ -21,7 +21,9 @@ noinst_HEADERS = grammar.tab.h grammar.tab.c grammar.tab.h: grammar.y ../gstmarshal.h $(BISON_PATH) -d -v -p_gst_parse__yy $(srcdir)/grammar.y -o grammar.tab.c -lex._gst_parse_yy.c: parse.l grammar.tab.h +parse.l : grammar.tab.h + +lex._gst_parse_yy.c: parse.l $(FLEX_PATH) -P_gst_parse_yy $^ ## this is so make install without a previous make can work, because Index: gst/gstplugin.c =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/gstplugin.c,v retrieving revision 1.111 retrieving revision 1.112 diff -u -p -r1.111 -r1.112 --- gst/gstplugin.c 16 Dec 2003 12:20:54 -0000 1.111 +++ gst/gstplugin.c 19 Dec 2003 20:27:03 -0000 1.112 @@ -35,7 +35,12 @@ #include "config.h" #include "gstfilter.h" + +#ifndef GST_DISABLE_GST_DEBUG #define GST_CAT_DEFAULT GST_CAT_PLUGIN_LOADING +#else +#define GST_CAT_DEFAULT 0 +#endif static GModule *main_module = NULL; static GList *_gst_plugin_static = NULL; Index: docs/gst/Makefile.am =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/docs/gst/Makefile.am,v retrieving revision 1.60 retrieving revision 1.61 diff -u -p -r1.60 -r1.61 --- docs/gst/Makefile.am 14 Dec 2003 22:27:25 -0000 1.60 +++ docs/gst/Makefile.am 19 Dec 2003 20:27:02 -0000 1.61 @@ -175,8 +175,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_ @echo '*** Building HTML ***' test -d html || mkdir html cd html && gtkdoc-mkhtml $(DOC_MODULE) $(srcdir)/../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || for i in $(HTML_IMAGES) ; do \ - cp $(srcdir)/$$i html ; done + test "x$(HTML_IMAGES)" = "x" || for i in "" $(HTML_IMAGES) ; do \ + if test "$$i" != ""; then cp $(srcdir)/$$i html ; fi; done @echo '-- Fixing Crossreferences' LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp @@ -285,8 +285,8 @@ dist-hook: dist-check-gtkdoc dist-hook-l -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html images=$(HTML_IMAGES) ; \ - for i in $$images ; do \ - cp $(srcdir)/$$i $(distdir)/html ; \ + for i in "" $$images ; do \ + if test "$$i" != ""; then cp $(srcdir)/$$i $(distdir)/html ; fi; \ done .PHONY : dist-hook-local Index: docs/libs/Makefile.am =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/docs/libs/Makefile.am,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- docs/libs/Makefile.am 14 Dec 2003 22:27:25 -0000 1.23 +++ docs/libs/Makefile.am 19 Dec 2003 20:27:02 -0000 1.24 @@ -175,8 +175,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_ @echo '*** Building HTML ***' test -d html || mkdir html cd html && gtkdoc-mkhtml $(DOC_MODULE) $(srcdir)/../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || for i in $(HTML_IMAGES) ; do \ - cp $(srcdir)/$$i html ; done + test "x$(HTML_IMAGES)" = "x" || for i in "" $(HTML_IMAGES) ; do \ + if test "$$i" != ""; then cp $(srcdir)/$$i html ; fi; done @echo '-- Fixing Crossreferences' LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp @@ -284,8 +284,8 @@ dist-hook: dist-check-gtkdoc dist-hook-l -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html images=$(HTML_IMAGES) ; \ - for i in $$images ; do \ - cp $(srcdir)/$$i $(distdir)/html ; \ + for i in "" $$images ; do \ + if test "$$i" != ""; then cp $(srcdir)/$$i $(distdir)/html ; fi; \ done .PHONY : dist-hook-local