check/Makefile.am: look in the right place for elements, a lot more chance of success
authorThomas Vander Stichele <thomas@apestaart.org>
Tue, 29 Nov 2005 18:14:35 +0000 (18:14 +0000)
committerThomas Vander Stichele <thomas@apestaart.org>
Tue, 29 Nov 2005 18:14:35 +0000 (18:14 +0000)
Original commit message from CVS:

* check/Makefile.am:
look in the right place for elements, a lot more chance of
success
* gst/Makefile.am:
remove indexers and elements subdirs
* plugins/Makefile.am:
make indexers conditional

ChangeLog
check/Makefile.am
gst/Makefile.am
plugins/Makefile.am
tests/check/Makefile.am

index 9f64d58936884154cac931e34ddee4aca8e298d3..d1395088243de2f4c8b14106e07bde2ad725956f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-11-29  Thomas Vander Stichele  <thomas (at) apestaart (dot) org>
+
+       * check/Makefile.am:
+         look in the right place for elements, a lot more chance of
+         success
+       * gst/Makefile.am:
+         remove indexers and elements subdirs
+       * plugins/Makefile.am:
+         make indexers conditional
+
 2005-11-29  Thomas Vander Stichele  <thomas (at) apestaart (dot) org>
 
        * Makefile.am:
index e563c69fb701a7d97723b4670cd499bc1ac4ad73..84a14d8dfb8c51b308b6f69d6ec02ee7fe88650b 100644 (file)
@@ -10,7 +10,7 @@ REGISTRY_ENVIRONMENT = \
 TESTS_ENVIRONMENT = \
         $(REGISTRY_ENVIRONMENT)                                 \
         GST_PLUGIN_SYSTEM_PATH=                                        \
-        GST_PLUGIN_PATH=$(top_builddir)/gst/elements:$(top_builddir)/gst/indexers
+        GST_PLUGIN_PATH=$(top_builddir)/plugins
 
 plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
index b141eade1a9d96886b1f3abc8b0009a4a4f33f46..3b7cd22fa86171f8289e86b20404987a918111a8 100644 (file)
@@ -36,10 +36,8 @@ endif
 
 if GST_DISABLE_INDEX
 GST_INDEX_SRC = 
-SUBDIRS_INDEX =
 else
 GST_INDEX_SRC = gstindex.c gstindexfactory.c
-SUBDIRS_INDEX = indexers
 endif
 
 if GST_DISABLE_PLUGIN
@@ -68,12 +66,10 @@ SUBDIRS = \
        $(SUBDIRS_PARSE) \
        . \
        base \
-       elements \
-       $(SUBDIRS_INDEX) \
        $(SUBDIRS_NET) \
        $(SUBDIRS_CHECK)
 
-DIST_SUBDIRS = base elements parse indexers net check
+DIST_SUBDIRS = base parse net check
 
 # make variables for all generated source and header files to make the
 # distinction clear
index fd1944f2db74714ae5c358d3bd12206dfa6860cf..f6ed61a774daf89c1a7762177402800796317304 100644 (file)
@@ -1 +1,9 @@
-SUBDIRS = elements indexers
+if GST_DISABLE_INDEX
+SUBDIRS_INDEX =
+else
+SUBDIRS_INDEX = indexers
+endif
+
+SUBDIRS = elements $(SUBDIRS_INDEX)
+
+DIST_SUBDIRS = elements indexers
index e563c69fb701a7d97723b4670cd499bc1ac4ad73..84a14d8dfb8c51b308b6f69d6ec02ee7fe88650b 100644 (file)
@@ -10,7 +10,7 @@ REGISTRY_ENVIRONMENT = \
 TESTS_ENVIRONMENT = \
         $(REGISTRY_ENVIRONMENT)                                 \
         GST_PLUGIN_SYSTEM_PATH=                                        \
-        GST_PLUGIN_PATH=$(top_builddir)/gst/elements:$(top_builddir)/gst/indexers
+        GST_PLUGIN_PATH=$(top_builddir)/plugins
 
 plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@