merge TYPEFIND branch. Major changes:

[platform/upstream/gstreamer.git] / plugins / elements / Makefile.am

diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index 5275532..0d6a67d 100644 (file)
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -1,37 +1,51 @@
-filterdir = $(libdir)/gst
+# FIXME:
+# need to get gstbufferstore.[ch] into its own lib, preferrably 
+# libs/gst/buifferstore
+# This requires building libs/gst before this dir, which we currently don't
+# do.
 
-filter_LTLIBRARIES = libgstelements.la
+plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
-libgstelements_la_DEPENDENCIES = ../libgst.la
+plugin_LTLIBRARIES = libgstelements.la
+
+libgstelements_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la
 libgstelements_la_SOURCES =    \
+       gstaggregator.c         \
+       gstbufferstore.c        \
        gstelements.c           \
-       gstfakesrc.c            \
-       gstidentity.c           \
        gstfakesink.c           \
+       gstfakesrc.c            \
+       gstfilesink.c           \
        gstfilesrc.c            \
-       gstdisksink.c           \
-       gstfdsrc.c              \
        gstfdsink.c             \
+       gstfdsrc.c              \
+       gstidentity.c           \
+       gstmd5sink.c            \
        gstmultidisksrc.c       \
        gstpipefilter.c         \
+       gstshaper.c             \
+       gststatistics.c         \
        gsttee.c                \
-       gstaggregator.c         \
-       gststatistics.c
+       gsttypefindelement.c
+
+libgstelements_la_CFLAGS = $(GST_CFLAGS)
+libgstelements_la_LIBADD =
+libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS =               \
-       gstfakesrc.h            \
-       gstidentity.h           \
+       gstaggregator.h         \
+       gstbufferstore.h        \
        gstfakesink.h           \
-       gstdisksink.h           \
+       gstfakesrc.h            \
+       gstfdsink.h             \
        gstfdsrc.h              \
+       gstfilesink.h           \
+       gstfilesrc.h            \
+       gstidentity.h           \
+       gstmd5sink.h            \
        gstmultidisksrc.h       \
-       gstfdsink.h             \
        gstpipefilter.h         \
+       gstshaper.h             \
+       gststatistics.h         \
        gsttee.h                \
-       gstaggregator.h         \
-       gststatistics.h         \
-       gstfilesrc.h
-
-libgstelements_la_CFLAGS = $(GHTTP_CFLAGS) $(GST_CFLAGS)
-libgstelements_la_LIBADD = $(GHTTP_LIBS) $(GST_LIBS)
-## left from merging, FIXME or DELETEME libgstelements_la_LDFLAGS = -version-info $(GST_LIBVERSION)
+       gsttypefindelement.h