From 249e792b7f330f2f03658664686a820c1ea1e554 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Tue, 29 Nov 2005 18:00:15 +0000 Subject: [PATCH] do CVS surgery and related build fixery to move elements and indexers in a new gstreamer/plugins directory, out of th... Original commit message from CVS: * Makefile.am: * configure.ac: * plugins/elements/Makefile.am: * plugins/elements/gstcapsfilter.c: * plugins/elements/gstfilesink.c: * plugins/elements/gstfilesrc.c: * plugins/elements/gstidentity.c: * plugins/indexers/Makefile.am: do CVS surgery and related build fixery to move elements and indexers in a new gstreamer/plugins directory, out of the gst/ directory --- ChangeLog | 14 ++++++++++++++ Makefile.am | 4 ++-- configure.ac | 5 +++-- docs/libs/tmpl/gstdataprotocol.sgml | 3 --- plugins/elements/Makefile.am | 2 +- plugins/elements/gstcapsfilter.c | 2 +- plugins/elements/gstfilesink.c | 2 +- plugins/elements/gstfilesrc.c | 2 +- plugins/elements/gstidentity.c | 2 +- plugins/indexers/Makefile.am | 2 ++ 10 files changed, 26 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index fcdfe31..9f64d58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2005-11-29 Thomas Vander Stichele + + * Makefile.am: + * configure.ac: + * plugins/elements/Makefile.am: + * plugins/elements/gstcapsfilter.c: + * plugins/elements/gstfilesink.c: + * plugins/elements/gstfilesrc.c: + * plugins/elements/gstidentity.c: + * plugins/indexers/Makefile.am: + do CVS surgery and related build fixery to move elements + and indexers in a new gstreamer/plugins directory, out of the + gst/ directory + 2005-11-29 Andy Wingo * check/Makefile.am: diff --git a/Makefile.am b/Makefile.am index 2db6379..7a198ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,7 @@ aclocaldir = $(datadir)/aclocal aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4 SUBDIRS = \ - gst libs tools \ + gst libs plugins tools \ $(SUBDIRS_CHECK) \ $(SUBDIRS_TESTS) \ $(SUBDIRS_EXAMPLES) \ @@ -43,7 +43,7 @@ SUBDIRS = \ # These are all the possible subdirs DIST_SUBDIRS = \ - gst libs tools \ + gst libs plugins tools \ check \ tests testsuite \ examples \ diff --git a/configure.ac b/configure.ac index 0b8f5d3..85c5e79 100644 --- a/configure.ac +++ b/configure.ac @@ -475,14 +475,15 @@ gst/gstconfig.h gst/gstversion.h gst/base/Makefile gst/check/Makefile -gst/indexers/Makefile gst/net/Makefile -gst/elements/Makefile gst/parse/Makefile libs/Makefile libs/gst/Makefile libs/gst/controller/Makefile libs/gst/dataprotocol/Makefile +plugins/Makefile +plugins/indexers/Makefile +plugins/elements/Makefile po/Makefile.in check/Makefile tests/Makefile diff --git a/docs/libs/tmpl/gstdataprotocol.sgml b/docs/libs/tmpl/gstdataprotocol.sgml index c5446c9..0277c7c 100644 --- a/docs/libs/tmpl/gstdataprotocol.sgml +++ b/docs/libs/tmpl/gstdataprotocol.sgml @@ -27,9 +27,6 @@ network connections also need a protocol to do this. #GstBuffer, #GstCaps, #GstEvent - - - diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am index 13f2331..f2b426e 100644 --- a/plugins/elements/Makefile.am +++ b/plugins/elements/Makefile.am @@ -12,7 +12,7 @@ else GSTFDSRC = endif -libgstelements_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la +libgstelements_la_DEPENDENCIES = $(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la libgstelements_la_SOURCES = \ gstbufferstore.c \ gstcapsfilter.c \ diff --git a/plugins/elements/gstcapsfilter.c b/plugins/elements/gstcapsfilter.c index a041297..2b20380 100644 --- a/plugins/elements/gstcapsfilter.c +++ b/plugins/elements/gstcapsfilter.c @@ -24,7 +24,7 @@ #include "config.h" #endif -#include "../gst-i18n-lib.h" +#include "../../gst/gst-i18n-lib.h" #include #include diff --git a/plugins/elements/gstfilesink.c b/plugins/elements/gstfilesink.c index a993d2e..576257a 100644 --- a/plugins/elements/gstfilesink.c +++ b/plugins/elements/gstfilesink.c @@ -31,7 +31,7 @@ # include "config.h" #endif -#include "../gst-i18n-lib.h" +#include "../../gst/gst-i18n-lib.h" #include #include diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c index 809a548..82d84c5 100644 --- a/plugins/elements/gstfilesrc.c +++ b/plugins/elements/gstfilesrc.c @@ -55,7 +55,7 @@ #include #include -#include "../gst-i18n-lib.h" +#include "../../gst/gst-i18n-lib.h" static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, diff --git a/plugins/elements/gstidentity.c b/plugins/elements/gstidentity.c index a4ede21..146d58b 100644 --- a/plugins/elements/gstidentity.c +++ b/plugins/elements/gstidentity.c @@ -28,7 +28,7 @@ # include "config.h" #endif -#include "../gst-i18n-lib.h" +#include "../../gst/gst-i18n-lib.h" #include "gstidentity.h" #include diff --git a/plugins/indexers/Makefile.am b/plugins/indexers/Makefile.am index c7cb86f..637ef4e 100644 --- a/plugins/indexers/Makefile.am +++ b/plugins/indexers/Makefile.am @@ -10,6 +10,8 @@ if HAVE_MMAP else GST_LOADSAVE_SRC = endif + +libgstindexers_la_DEPENDENCIES = $(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC) libgstindexers_la_CFLAGS = $(GST_OBJ_CFLAGS) libgstindexers_la_LIBADD = $(GST_OBJ_LIBS) -- 2.7.4