gst/Makefile.am

Original commit message from CVS:

* gst/Makefile.am
* tests/examples/Makefile.am:
fix --disable-parse build

diff --git a/ChangeLog b/ChangeLog
index 436fa50..d188cf1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * tools/gst-feedback.1.in:

diff --git a/docs/gst/.gitignore b/docs/gst/.gitignore
index 9d2ca3c..b4160c7 100644 (file)
--- a/docs/gst/.gitignore
+++ b/docs/gst/.gitignore
@@ -35,3 +35,5 @@ html-build.stamp
 *.ps
 gtkdoc-fixxref
 xml
+
+gstreamer.types

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

diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am
index e629139..a08128d 100644 (file)
--- a/tests/examples/Makefile.am
+++ b/tests/examples/Makefile.am
@@ -4,10 +4,15 @@ else
 GST_LOADSAVE_DIRS = xml typefind
 endif
 
-dirs = \
+if GST_DISABLE_PARSE
+GST_PARSE_DIRS = 
+else
+GST_PARSE_DIRS = launch
+endif
+
+always_dirs = \
        controller                      \
        helloworld                      \
-       launch                          \
        metadata                        \
        queue
 
@@ -27,7 +32,9 @@ dirs = \
 #retag
 #thread
 
-SUBDIRS = $(dirs)                      \
+SUBDIRS =                              \
+       $(always_dirs)                  \
+       $(GST_PARSE_DIRS)               \
        $(GST_LOADSAVE_DIRS)
 
-DIST_SUBDIRS = $(dirs) xml typefind
+DIST_SUBDIRS = $(always_dirs) xml typefind launch