s/filter/plugin/ add $(GST_LIBS) to all plugins move Makefile.am things around to...

Original commit message from CVS:
* s/filter/plugin/
* add $(GST_LIBS) to all plugins
* move Makefile.am things around to a mostly standard layout
* remove HTTP flags/libs from elements since http element moved

diff --git a/examples/autoplug/Makefile.am b/examples/autoplug/Makefile.am
index 7583590..8deb500 100644 (file)
--- a/examples/autoplug/Makefile.am
+++ b/examples/autoplug/Makefile.am
@@ -1,4 +1,4 @@
 noinst_PROGRAMS = autoplug
 
-autoplug_LDADD = $(GNOME_LIBS) $(GST_LIBS)
-autoplug_CFLAGS = $(GNOME_CFLAGS) $(GST_CFLAGS)
+autoplug_LDADD = $(GST_LIBS) $(GNOME_LIBS)
+autoplug_CFLAGS = $(GST_CFLAGS) $(GNOME_CFLAGS)

diff --git a/examples/plugins/Makefile.am b/examples/plugins/Makefile.am
index 45b8da9..41edbfe 100644 (file)
--- a/examples/plugins/Makefile.am
+++ b/examples/plugins/Makefile.am
@@ -2,4 +2,6 @@ noinst_LTLIBRARIES = libexample.la
 
 libexample_la_SOURCES = example.c
 libexample_la_CFLAGS = $(GST_CFLAGS)
+libexample_la_LIBADD = $(GST_LIBS)
+
 noinst_HEADERS = example.h

diff --git a/gst/autoplug/Makefile.am b/gst/autoplug/Makefile.am
index a668503..8e9621a 100644 (file)
--- a/gst/autoplug/Makefile.am
+++ b/gst/autoplug/Makefile.am
@@ -1,22 +1,30 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgststaticautoplug.la libgststaticautoplugrender.la \
-       libgstautoplugcache.la libgstautoplugger.la
+plugin_LTLIBRARIES = \
+       libgststaticautoplug.la \
+       libgststaticautoplugrender.la \
+       libgstautoplugcache.la \
+       libgstautoplugger.la
 
 libgststaticautoplug_la_SOURCES = gststaticautoplug.c 
-libgststaticautoplugrender_la_SOURCES =        gststaticautoplugrender.c
-libgstautoplugcache_la_SOURCES = gstautoplugcache.c
-libgstautoplugger_la_SOURCES = gstautoplugger.c
-
+libgststaticautoplug_la_CFLAGS = $(GST_CFLAGS)
+libgststaticautoplug_la_LIBADD = $(GST_LIBS)
 libgststaticautoplug_la_LDFLAGS = -version-info $(GST_LIBVERSION)
+
+libgststaticautoplugrender_la_SOURCES = gststaticautoplugrender.c
+libgststaticautoplugrender_la_CFLAGS = $(GST_CFLAGS)
+libgststaticautoplugrender_la_LIBADD = $(GST_LIBS)
 libgststaticautoplugrender_la_LDFLAGS = -version-info $(GST_LIBVERSION)
+
+libgstautoplugcache_la_SOURCES = gstautoplugcache.c
+libgstautoplugcache_la_CFLAGS = $(GST_CFLAGS)
+libgstautoplugcache_la_LIBADD = $(GST_LIBS)
 libgstautoplugcache_la_LDFLAGS = -version-info $(GST_LIBVERSION)
-libgstautoplugger_la_LDFLAGS = -version-info $(GST_LIBVERSION)
 
-libgststaticautoplug_la_CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
-libgststaticautoplugrender_la_CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
-libgstautoplugcache_la_CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
-libgstautoplugger_la_CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
+libgstautoplugger_la_SOURCES = gstautoplugger.c
+libgstautoplugger_la_CFLAGS = $(GST_CFLAGS)
+libgstautoplugger_la_LIBADD = $(GST_LIBS)
+libgstautoplugger_la_LDFLAGS = -version-info $(GST_LIBVERSION)
 
 noinst_HEADERS = gststaticautoplug.h gststaticautoplugrender.h
 

diff --git a/gst/elements/Makefile.am b/gst/elements/Makefile.am
index 5275532..6ea10ff 100644 (file)
--- a/gst/elements/Makefile.am
+++ b/gst/elements/Makefile.am
@@ -1,6 +1,6 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstelements.la
+plugin_LTLIBRARIES = libgstelements.la
 
 libgstelements_la_DEPENDENCIES = ../libgst.la
 libgstelements_la_SOURCES =    \
@@ -17,6 +17,9 @@ libgstelements_la_SOURCES =   \
        gsttee.c                \
        gstaggregator.c         \
        gststatistics.c
+libgstelements_la_CFLAGS = $(GST_CFLAGS)
+libgstelements_la_LIBADD = $(GST_LIBS)
+libgstelements_la_LDFLAGS = -version-info $(GST_LIBVERSION)
 
 noinst_HEADERS =               \
        gstfakesrc.h            \
@@ -31,7 +34,3 @@ noinst_HEADERS =              \
        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)

diff --git a/gst/schedulers/Makefile.am b/gst/schedulers/Makefile.am
index 98de654..77d21e5 100644 (file)
--- a/gst/schedulers/Makefile.am
+++ b/gst/schedulers/Makefile.am
@@ -1,9 +1,8 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstbasicscheduler.la
+plugin_LTLIBRARIES = libgstbasicscheduler.la
 
 libgstbasicscheduler_la_SOURCES = gstbasicscheduler.c 
-
-libgstbasicscheduler_la_LDFLAGS = -version-info $(GST_LIBVERSION)
-
 libgstbasicscheduler_la_CFLAGS = $(GST_CFLAGS)
+libgstbasicscheduler_la_LIBADD = $(GST_LIBS)
+libgstbasicscheduler_la_LDFLAGS = -version-info $(GST_LIBVERSION)

diff --git a/gst/types/Makefile.am b/gst/types/Makefile.am
index d73b3e2..be464ea 100644 (file)
--- a/gst/types/Makefile.am
+++ b/gst/types/Makefile.am
@@ -1,9 +1,8 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgsttypes.la
+plugin_LTLIBRARIES = libgsttypes.la
 
 libgsttypes_la_SOURCES = gsttypes.c
-
 libgsttypes_la_CFLAGS = $(GST_CFLAGS)
 libgsttypes_la_LIBADD = $(GST_LIBS)
 libgsttypes_la_LDFLAGS = -version-info $(GST_LIBVERSION)

diff --git a/libs/gst/bytestream/Makefile.am b/libs/gst/bytestream/Makefile.am
index 5821bf6..1a355cf 100644 (file)
--- a/libs/gst/bytestream/Makefile.am
+++ b/libs/gst/bytestream/Makefile.am
@@ -1,15 +1,15 @@
 librarydir = $(libdir)/gst
 
-library_LTLIBRARIES = libgstbytestream.la libgstbstest.la
-
-libgstbytestream_la_SOURCES = bytestream.c 
-libgstbstest_la_SOURCES = bstest.c
+library_LTLIBRARIES = libgstbytestream.la
+noinst_LTLIBRARIES = libgstbstest.la
 
 libgstbytestreamincludedir = $(includedir)/gst/bytestream
 libgstbytestreaminclude_HEADERS = bytestream.h
 
-libgstbytestream_la_LIBADD = $(GST_LIBS)
+libgstbytestream_la_SOURCES = bytestream.c 
 libgstbytestream_la_CFLAGS = $(GST_CFLAGS)
+libgstbytestream_la_LIBADD = $(GST_LIBS)
 
-libgstbstest_la_LIBADD = $(GST_LIBS)
+libgstbstest_la_SOURCES = bstest.c
 libgstbstest_la_CFLAGS = $(GST_CFLAGS)
+libgstbstest_la_LIBADD = $(GST_LIBS)

diff --git a/libs/gst/control/Makefile.am b/libs/gst/control/Makefile.am
index bddc68f..4207e73 100644 (file)
--- a/libs/gst/control/Makefile.am
+++ b/libs/gst/control/Makefile.am
@@ -2,13 +2,6 @@ librarydir = $(libdir)/gst
 
 library_LTLIBRARIES = libgstcontrol.la
 
-libgstcontrol_la_SOURCES = \
-    control.c \
-    dparammanager.c \
-    dparam.c \
-    dplinearinterp.c
-    
-
 libgstcontrolincludedir = $(includedir)/gst/control
 libgstcontrolinclude_HEADERS = \
     control.h \
@@ -17,6 +10,10 @@ libgstcontrolinclude_HEADERS = \
     dparamcommon.h \
     dplinearinterp.h
 
-libgstcontrol_la_LIBADD = $(GST_LIBS)
+libgstcontrol_la_SOURCES = \
+    control.c \
+    dparammanager.c \
+    dparam.c \
+    dplinearinterp.c
 libgstcontrol_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math
-
+libgstcontrol_la_LIBADD = $(GST_LIBS)

diff --git a/libs/gst/getbits/Makefile.am b/libs/gst/getbits/Makefile.am
index 850d773..ad77a84 100644 (file)
--- a/libs/gst/getbits/Makefile.am
+++ b/libs/gst/getbits/Makefile.am
@@ -8,15 +8,14 @@ else
 GSTARCH_SRCS = 
 endif
 
-libgstgetbits_la_SOURCES = getbits.c gstgetbits_inl.h gstgetbits_generic.c $(GSTARCH_SRCS)
-libgstgetbits_la_LIBADD = $(GST_LIBS)
-libgstgetbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
-EXTRA_libgstgetbits_la_SOURCES = gstgetbits_i386.s
-
 libgstgetbitsincludedir = $(includedir)/gst/getbits
 libgstgetbitsinclude_HEADERS = getbits.h
 
+libgstgetbits_la_SOURCES = getbits.c gstgetbits_inl.h gstgetbits_generic.c $(GSTARCH_SRCS)
+EXTRA_libgstgetbits_la_SOURCES = gstgetbits_i386.s
+libgstgetbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
+libgstgetbits_la_LIBADD = $(GST_LIBS)
+
 noinst_HEADERS = getbits.h gstgetbits_inl.h
 
 # check_PROGRAMS = gbtest
-

diff --git a/libs/gst/putbits/Makefile.am b/libs/gst/putbits/Makefile.am
index 76a6f49..6fb5763 100644 (file)
--- a/libs/gst/putbits/Makefile.am
+++ b/libs/gst/putbits/Makefile.am
@@ -2,12 +2,11 @@ librarydir = $(libdir)/gst
 
 library_LTLIBRARIES = libgstputbits.la
 
-libgstputbits_la_SOURCES = putbits.c 
-
 libgstputbitsincludedir = $(includedir)/gst/putbits
 libgstputbitsinclude_HEADERS = putbits.h
 
-noinst_HEADERS = putbits.h 
-
-libgstputbits_la_LIBADD = $(GST_LIBS)
+libgstputbits_la_SOURCES = putbits.c 
 libgstputbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
+libgstputbits_la_LIBADD = $(GST_LIBS)
+
+noinst_HEADERS = putbits.h 

diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index 5275532..6ea10ff 100644 (file)
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -1,6 +1,6 @@
-filterdir = $(libdir)/gst
+plugindir = $(libdir)/gst
 
-filter_LTLIBRARIES = libgstelements.la
+plugin_LTLIBRARIES = libgstelements.la
 
 libgstelements_la_DEPENDENCIES = ../libgst.la
 libgstelements_la_SOURCES =    \
@@ -17,6 +17,9 @@ libgstelements_la_SOURCES =   \
        gsttee.c                \
        gstaggregator.c         \
        gststatistics.c
+libgstelements_la_CFLAGS = $(GST_CFLAGS)
+libgstelements_la_LIBADD = $(GST_LIBS)
+libgstelements_la_LDFLAGS = -version-info $(GST_LIBVERSION)
 
 noinst_HEADERS =               \
        gstfakesrc.h            \
@@ -31,7 +34,3 @@ noinst_HEADERS =              \
        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)

diff --git a/tests/old/examples/autoplug/Makefile.am b/tests/old/examples/autoplug/Makefile.am
index 7583590..8deb500 100644 (file)
--- a/tests/old/examples/autoplug/Makefile.am
+++ b/tests/old/examples/autoplug/Makefile.am
@@ -1,4 +1,4 @@
 noinst_PROGRAMS = autoplug
 
-autoplug_LDADD = $(GNOME_LIBS) $(GST_LIBS)
-autoplug_CFLAGS = $(GNOME_CFLAGS) $(GST_CFLAGS)
+autoplug_LDADD = $(GST_LIBS) $(GNOME_LIBS)
+autoplug_CFLAGS = $(GST_CFLAGS) $(GNOME_CFLAGS)

diff --git a/tests/old/examples/plugins/Makefile.am b/tests/old/examples/plugins/Makefile.am
index 45b8da9..41edbfe 100644 (file)
--- a/tests/old/examples/plugins/Makefile.am
+++ b/tests/old/examples/plugins/Makefile.am
@@ -2,4 +2,6 @@ noinst_LTLIBRARIES = libexample.la
 
 libexample_la_SOURCES = example.c
 libexample_la_CFLAGS = $(GST_CFLAGS)
+libexample_la_LIBADD = $(GST_LIBS)
+
 noinst_HEADERS = example.h

diff --git a/tests/old/testsuite/bytestream/Makefile.am b/tests/old/testsuite/bytestream/Makefile.am
index 72695bf..696ad98 100644 (file)
--- a/tests/old/testsuite/bytestream/Makefile.am
+++ b/tests/old/testsuite/bytestream/Makefile.am
@@ -5,7 +5,7 @@ testprogs = test1
 check_PROGRAMS = $(testprogs)
 
 test1_SOURCES = test1.c gstbstest.c mem.c
-test1_LDFLAGS = $(GST_LIBS) -L$(top_builddir)/libs/gst/bytestream/ -lgstbytestream
 test1_CFLAGS = $(GST_CFLAGS)
+test1_LDFLAGS = $(GST_LIBS) -L$(top_builddir)/libs/gst/bytestream/ -lgstbytestream
 
 noinst_HEADERS = mem.h

diff --git a/tests/old/testsuite/capsnego/Makefile.am b/tests/old/testsuite/capsnego/Makefile.am
index edb2dd3..8415157 100644 (file)
--- a/tests/old/testsuite/capsnego/Makefile.am
+++ b/tests/old/testsuite/capsnego/Makefile.am
@@ -4,6 +4,5 @@ TESTS = $(testprogs)
 
 check_PROGRAMS = $(testprogs)
 
-# we have nothing but apps here, we can do this safely
-LIBS = $(GST_LIBS)
-CFLAGS = $(GST_CFLAGS)
+AM_CFLAGS = $(GST_CFLAGS)
+LIBS  = $(GST_LIBS)

diff --git a/tests/old/testsuite/plugin/Makefile.am b/tests/old/testsuite/plugin/Makefile.am
index c2286c2..3f4b63c 100644 (file)
--- a/tests/old/testsuite/plugin/Makefile.am
+++ b/tests/old/testsuite/plugin/Makefile.am
@@ -2,6 +2,9 @@
 testprogs = static # dynamic linked loading registry static2
 # filterdir = $(libdir)/gst
 
+AM_CFLAGS = $(GST_CFLAGS)
+LIBS = $(GST_LIBS)
+
 noinst_LTLIBRARIES = libtestplugin.la libtestplugin2.la
 
 libtestplugin_la_SOURCES = testplugin.c
@@ -18,7 +21,3 @@ static_SOURCES = static.c testplugin_s.c testplugin2_s.c
 TESTS = $(testprogs)
 
 check_PROGRAMS = $(testprogs)
-
-LIBS = $(GST_LIBS)
-CFLAGS = $(GST_CFLAGS)
-

diff --git a/testsuite/bytestream/Makefile.am b/testsuite/bytestream/Makefile.am
index 72695bf..696ad98 100644 (file)
--- a/testsuite/bytestream/Makefile.am
+++ b/testsuite/bytestream/Makefile.am
@@ -5,7 +5,7 @@ testprogs = test1
 check_PROGRAMS = $(testprogs)
 
 test1_SOURCES = test1.c gstbstest.c mem.c
-test1_LDFLAGS = $(GST_LIBS) -L$(top_builddir)/libs/gst/bytestream/ -lgstbytestream
 test1_CFLAGS = $(GST_CFLAGS)
+test1_LDFLAGS = $(GST_LIBS) -L$(top_builddir)/libs/gst/bytestream/ -lgstbytestream
 
 noinst_HEADERS = mem.h

diff --git a/testsuite/capsnego/Makefile.am b/testsuite/capsnego/Makefile.am
index edb2dd3..8415157 100644 (file)
--- a/testsuite/capsnego/Makefile.am
+++ b/testsuite/capsnego/Makefile.am
@@ -4,6 +4,5 @@ TESTS = $(testprogs)
 
 check_PROGRAMS = $(testprogs)
 
-# we have nothing but apps here, we can do this safely
-LIBS = $(GST_LIBS)
-CFLAGS = $(GST_CFLAGS)
+AM_CFLAGS = $(GST_CFLAGS)
+LIBS  = $(GST_LIBS)

diff --git a/testsuite/plugin/Makefile.am b/testsuite/plugin/Makefile.am
index c2286c2..3f4b63c 100644 (file)
--- a/testsuite/plugin/Makefile.am
+++ b/testsuite/plugin/Makefile.am
@@ -2,6 +2,9 @@
 testprogs = static # dynamic linked loading registry static2
 # filterdir = $(libdir)/gst
 
+AM_CFLAGS = $(GST_CFLAGS)
+LIBS = $(GST_LIBS)
+
 noinst_LTLIBRARIES = libtestplugin.la libtestplugin2.la
 
 libtestplugin_la_SOURCES = testplugin.c
@@ -18,7 +21,3 @@ static_SOURCES = static.c testplugin_s.c testplugin2_s.c
 TESTS = $(testprogs)
 
 check_PROGRAMS = $(testprogs)
-
-LIBS = $(GST_LIBS)
-CFLAGS = $(GST_CFLAGS)
-