mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-08 16:35:40 +00:00
check/Makefile.am: look in the right place for elements, a lot more chance of success
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
This commit is contained in:
parent
a049501d8a
commit
9389a2f8b3
5 changed files with 22 additions and 8 deletions
10
ChangeLog
10
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>
|
2005-11-29 Thomas Vander Stichele <thomas (at) apestaart (dot) org>
|
||||||
|
|
||||||
* Makefile.am:
|
* Makefile.am:
|
||||||
|
|
|
@ -10,7 +10,7 @@ REGISTRY_ENVIRONMENT = \
|
||||||
TESTS_ENVIRONMENT = \
|
TESTS_ENVIRONMENT = \
|
||||||
$(REGISTRY_ENVIRONMENT) \
|
$(REGISTRY_ENVIRONMENT) \
|
||||||
GST_PLUGIN_SYSTEM_PATH= \
|
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@
|
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
|
||||||
|
|
||||||
|
|
|
@ -36,10 +36,8 @@ endif
|
||||||
|
|
||||||
if GST_DISABLE_INDEX
|
if GST_DISABLE_INDEX
|
||||||
GST_INDEX_SRC =
|
GST_INDEX_SRC =
|
||||||
SUBDIRS_INDEX =
|
|
||||||
else
|
else
|
||||||
GST_INDEX_SRC = gstindex.c gstindexfactory.c
|
GST_INDEX_SRC = gstindex.c gstindexfactory.c
|
||||||
SUBDIRS_INDEX = indexers
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if GST_DISABLE_PLUGIN
|
if GST_DISABLE_PLUGIN
|
||||||
|
@ -68,12 +66,10 @@ SUBDIRS = \
|
||||||
$(SUBDIRS_PARSE) \
|
$(SUBDIRS_PARSE) \
|
||||||
. \
|
. \
|
||||||
base \
|
base \
|
||||||
elements \
|
|
||||||
$(SUBDIRS_INDEX) \
|
|
||||||
$(SUBDIRS_NET) \
|
$(SUBDIRS_NET) \
|
||||||
$(SUBDIRS_CHECK)
|
$(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
|
# make variables for all generated source and header files to make the
|
||||||
# distinction clear
|
# distinction clear
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -10,7 +10,7 @@ REGISTRY_ENVIRONMENT = \
|
||||||
TESTS_ENVIRONMENT = \
|
TESTS_ENVIRONMENT = \
|
||||||
$(REGISTRY_ENVIRONMENT) \
|
$(REGISTRY_ENVIRONMENT) \
|
||||||
GST_PLUGIN_SYSTEM_PATH= \
|
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@
|
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue