do CVS surgery and related build fixery to move elements and indexers in a new gstrea...

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

diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index 4d6d5a8..f2b426e 100644 (file)
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -1,73 +1,46 @@
 # FIXME:
-# need to get gstbufferstore.[ch] into its own lib, preferrably 
-# libs/gst/buifferstore
+# need to get gstbufferstore.[ch] into its own lib, preferably 
+# libs/gst/bufferstore
 # This requires building libs/gst before this dir, which we currently don't
 # do.
 
 plugin_LTLIBRARIES = libgstelements.la
-AS_LIBTOOL_LIB = libgstelements
 
-EXTRA_DIST = $(as_libtool_EXTRA_DIST)
-noinst_DATA = $(as_libtool_noinst_DATA_files)
-
-# FIXME:
-# Disable multifilesrc on Windows, cause it uses mmap excessively
-# and I don't feel like fixing it yet.  See also the disablement
-# in gstelements.c.
-if AS_LIBTOOL_WIN32
-multifilesrc = 
-pipefilter =
+if HAVE_SYS_SOCKET_H
+GSTFDSRC = gstfdsrc.c
 else
-multifilesrc = gstmultifilesrc.c
-pipefilter = gstpipefilter.c
+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         \
        gstfakesrc.c            \
        gstfakesink.c           \
+       $(GSTFDSRC)             \
+       gstfilesink.c           \
        gstfilesrc.c            \
        gstidentity.c           \
        gstelements.c           \
-       gsttee.c
-
-#      gstaggregator.c         \
-#      gstbufferstore.c        \
-#      gstfilesink.c           \
-#      gstfdsink.c             \
-#      gstfdsrc.c              \
-#      gstmd5sink.c            \
-#      $(multifilesrc)         \
-#      $(pipefilter)           \
-#      gstshaper.c             \
-#      gststatistics.c         \
-#      gsttypefindelement.c
+       gsttee.c                \
+       gsttypefindelement.c
 
 libgstelements_la_CFLAGS = $(GST_OBJ_CFLAGS)
-libgstelements_la_LIBADD = $(GST_OBJ_LIBS)
-libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS) $(top_builddir)/gst/base/libgstbase.la
+libgstelements_la_LIBADD = \
+       $(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la \
+       $(GST_OBJ_LIBS)
+libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS =               \
-       gstaggregator.h         \
        gstbufferstore.h        \
        gstfakesink.h           \
        gstfakesrc.h            \
-       gstfdsink.h             \
        gstfdsrc.h              \
        gstfilesink.h           \
        gstfilesrc.h            \
        gstidentity.h           \
-       gstmd5sink.h            \
-       gstmultifilesrc.h       \
-       gstpipefilter.h         \
-       gstshaper.h             \
-       gststatistics.h         \
        gsttee.h                \
        gsttypefindelement.h
 
-install-data-local: as-libtool-install-data-local
-
-uninstall-local: as-libtool-uninstall-local
-
-include $(top_srcdir)/common/as-libtool.mak
-
+EXTRA_DIST = gstfdsrc.c