gst/Makefile.am

Original commit message from CVS:

* gst/Makefile.am
* tests/examples/Makefile.am:
fix --disable-parse build
This commit is contained in:
Thomas Vander Stichele 2006-03-21 17:25:22 +00:00
parent e5b9797af6
commit 94cb0d62f0
4 changed files with 25 additions and 5 deletions

View file

@ -1,3 +1,9 @@
2006-03-21 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/Makefile.am
* tests/examples/Makefile.am:
fix --disable-parse build
2006-03-21 Tim-Philipp Müller <tim at centricular dot net> 2006-03-21 Tim-Philipp Müller <tim at centricular dot net>
* tools/gst-feedback.1.in: * tools/gst-feedback.1.in:

2
docs/gst/.gitignore vendored
View file

@ -35,3 +35,5 @@ html-build.stamp
*.ps *.ps
gtkdoc-fixxref gtkdoc-fixxref
xml xml
gstreamer.types

View file

@ -14,10 +14,12 @@ endif
if GST_DISABLE_PARSE if GST_DISABLE_PARSE
GST_PARSE_SRC = GST_PARSE_SRC =
GST_PARSE_H =
SUBDIRS_PARSE = SUBDIRS_PARSE =
GST_PARSE_LA = GST_PARSE_LA =
else else
GST_PARSE_SRC = gstparse.c GST_PARSE_SRC = gstparse.c
GST_PARSE_H = gstparse.h
SUBDIRS_PARSE = parse SUBDIRS_PARSE = parse
GST_PARSE_LA = parse/libgstparse.la GST_PARSE_LA = parse/libgstparse.la
endif endif
@ -188,13 +190,16 @@ gst_headers = \
gstutils.h \ gstutils.h \
gstvalue.h \ gstvalue.h \
gstregistry.h \ gstregistry.h \
gstparse.h \ $(GST_PARSE_H) \
gstxml.h gstxml.h
libgstreamer_@GST_MAJORMINOR@include_HEADERS = $(gst_headers) libgstreamer_@GST_MAJORMINOR@include_HEADERS = $(gst_headers)
nodist_libgstreamer_@GST_MAJORMINOR@include_HEADERS = \ nodist_libgstreamer_@GST_MAJORMINOR@include_HEADERS = \
$(built_header_configure) $(built_header_make) $(built_header_configure) $(built_header_make)
EXTRA_DIST = \
gstparse.h
noinst_HEADERS = \ noinst_HEADERS = \
gettext.h \ gettext.h \
glib-compat-private.h \ glib-compat-private.h \

View file

@ -4,10 +4,15 @@ else
GST_LOADSAVE_DIRS = xml typefind GST_LOADSAVE_DIRS = xml typefind
endif endif
dirs = \ if GST_DISABLE_PARSE
GST_PARSE_DIRS =
else
GST_PARSE_DIRS = launch
endif
always_dirs = \
controller \ controller \
helloworld \ helloworld \
launch \
metadata \ metadata \
queue queue
@ -27,7 +32,9 @@ dirs = \
#retag #retag
#thread #thread
SUBDIRS = $(dirs) \ SUBDIRS = \
$(always_dirs) \
$(GST_PARSE_DIRS) \
$(GST_LOADSAVE_DIRS) $(GST_LOADSAVE_DIRS)
DIST_SUBDIRS = $(dirs) xml typefind DIST_SUBDIRS = $(always_dirs) xml typefind launch