mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 21:21:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fixed shell in docs/gst/Makefile.am and docs/libs/Makefile.am so that it works with Solaris /bin/sh. Fixed gst/gstpl...

Browse source 
Original commit message from CVS:
Fixed shell in docs/gst/Makefile.am and docs/libs/Makefile.am so that
it works with Solaris /bin/sh.  Fixed gst/gstplugin.c so it compiles
properly when the configure --disable-gst_debug option is used.
Fixed gst/parse/Makefile.am so that it doesn't append grammar.tab.h to
the end of lex._gst_parse_yy.c since lex._gst_parse_yy.c already
includes grammar.tab.h via a <#include ...> line.
This commit is contained in:
Brian Cameron 2003-12-19 20:27:03 +00:00
parent b0a17df7ea
commit 0cb4645646
4 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/gst/Makefile.am
View file

@ -175,8 +175,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo '*** Building HTML ***' @echo '*** Building HTML ***'
test -d html || mkdir html test -d html || mkdir html
cd html && gtkdoc-mkhtml $(DOC_MODULE) $(srcdir)/../$(DOC_MAIN_SGML_FILE) cd html && gtkdoc-mkhtml $(DOC_MODULE) $(srcdir)/../$(DOC_MAIN_SGML_FILE)
test "x$(HTML_IMAGES)" = "x" || for i in $(HTML_IMAGES) ; do \ test "x$(HTML_IMAGES)" = "x" || for i in "" $(HTML_IMAGES) ; do \
cp $(srcdir)/$$i html ; done if test "$$i" != ""; then cp $(srcdir)/$$i html ; fi; done
@echo '-- Fixing Crossreferences' @echo '-- Fixing Crossreferences'
LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
touch html-build.stamp touch html-build.stamp
@ -285,8 +285,8 @@ dist-hook: dist-check-gtkdoc dist-hook-local
-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
images=$(HTML_IMAGES) ; \ images=$(HTML_IMAGES) ; \
for i in $$images ; do \ for i in "" $$images ; do \
cp $(srcdir)/$$i $(distdir)/html ; \ if test "$$i" != ""; then cp $(srcdir)/$$i $(distdir)/html ; fi; \
done done
.PHONY : dist-hook-local .PHONY : dist-hook-local

8
docs/libs/Makefile.am
View file

@ -175,8 +175,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo '*** Building HTML ***' @echo '*** Building HTML ***'
test -d html || mkdir html test -d html || mkdir html
cd html && gtkdoc-mkhtml $(DOC_MODULE) $(srcdir)/../$(DOC_MAIN_SGML_FILE) cd html && gtkdoc-mkhtml $(DOC_MODULE) $(srcdir)/../$(DOC_MAIN_SGML_FILE)
test "x$(HTML_IMAGES)" = "x" || for i in $(HTML_IMAGES) ; do \ test "x$(HTML_IMAGES)" = "x" || for i in "" $(HTML_IMAGES) ; do \
cp $(srcdir)/$$i html ; done if test "$$i" != ""; then cp $(srcdir)/$$i html ; fi; done
@echo '-- Fixing Crossreferences' @echo '-- Fixing Crossreferences'
LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
touch html-build.stamp touch html-build.stamp
@ -284,8 +284,8 @@ dist-hook: dist-check-gtkdoc dist-hook-local
-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
images=$(HTML_IMAGES) ; \ images=$(HTML_IMAGES) ; \
for i in $$images ; do \ for i in "" $$images ; do \
cp $(srcdir)/$$i $(distdir)/html ; \ if test "$$i" != ""; then cp $(srcdir)/$$i $(distdir)/html ; fi; \
done done
.PHONY : dist-hook-local .PHONY : dist-hook-local

5
gst/gstplugin.c
View file

@ -35,7 +35,12 @@
#include "config.h" #include "config.h"
#include "gstfilter.h" #include "gstfilter.h"
#ifndef GST_DISABLE_GST_DEBUG
#define GST_CAT_DEFAULT GST_CAT_PLUGIN_LOADING #define GST_CAT_DEFAULT GST_CAT_PLUGIN_LOADING
#else
#define GST_CAT_DEFAULT 0
#endif
static GModule *main_module = NULL; static GModule *main_module = NULL;
static GList *_gst_plugin_static = NULL; static GList *_gst_plugin_static = NULL;

4
gst/parse/Makefile.am
View file

@ -21,7 +21,9 @@ noinst_HEADERS = grammar.tab.h
grammar.tab.c grammar.tab.h: grammar.y ../gstmarshal.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 $(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 $^ $(FLEX_PATH) -P_gst_parse_yy $^
## this is so make install without a previous make can work, because ## this is so make install without a previous make can work, because