mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-06-26 09:50:39 +00:00
s/filter/plugin/ add $(GST_LIBS) to all plugins move Makefile.am things around to a mostly standard layout remove HTT...
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
This commit is contained in:
parent
b8d6a9a91d
commit
8da28910bc
|
@ -1,4 +1,4 @@
|
||||||
noinst_PROGRAMS = autoplug
|
noinst_PROGRAMS = autoplug
|
||||||
|
|
||||||
autoplug_LDADD = $(GNOME_LIBS) $(GST_LIBS)
|
autoplug_LDADD = $(GST_LIBS) $(GNOME_LIBS)
|
||||||
autoplug_CFLAGS = $(GNOME_CFLAGS) $(GST_CFLAGS)
|
autoplug_CFLAGS = $(GST_CFLAGS) $(GNOME_CFLAGS)
|
||||||
|
|
|
@ -2,4 +2,6 @@ noinst_LTLIBRARIES = libexample.la
|
||||||
|
|
||||||
libexample_la_SOURCES = example.c
|
libexample_la_SOURCES = example.c
|
||||||
libexample_la_CFLAGS = $(GST_CFLAGS)
|
libexample_la_CFLAGS = $(GST_CFLAGS)
|
||||||
|
libexample_la_LIBADD = $(GST_LIBS)
|
||||||
|
|
||||||
noinst_HEADERS = example.h
|
noinst_HEADERS = example.h
|
||||||
|
|
|
@ -1,22 +1,30 @@
|
||||||
filterdir = $(libdir)/gst
|
plugindir = $(libdir)/gst
|
||||||
|
|
||||||
filter_LTLIBRARIES = libgststaticautoplug.la libgststaticautoplugrender.la \
|
plugin_LTLIBRARIES = \
|
||||||
libgstautoplugcache.la libgstautoplugger.la
|
libgststaticautoplug.la \
|
||||||
|
libgststaticautoplugrender.la \
|
||||||
|
libgstautoplugcache.la \
|
||||||
|
libgstautoplugger.la
|
||||||
|
|
||||||
libgststaticautoplug_la_SOURCES = gststaticautoplug.c
|
libgststaticautoplug_la_SOURCES = gststaticautoplug.c
|
||||||
libgststaticautoplugrender_la_SOURCES = gststaticautoplugrender.c
|
libgststaticautoplug_la_CFLAGS = $(GST_CFLAGS)
|
||||||
libgstautoplugcache_la_SOURCES = gstautoplugcache.c
|
libgststaticautoplug_la_LIBADD = $(GST_LIBS)
|
||||||
libgstautoplugger_la_SOURCES = gstautoplugger.c
|
|
||||||
|
|
||||||
libgststaticautoplug_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
libgststaticautoplug_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||||
libgststaticautoplugrender_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
|
||||||
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_SOURCES = gststaticautoplugrender.c
|
||||||
libgststaticautoplugrender_la_CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
|
libgststaticautoplugrender_la_CFLAGS = $(GST_CFLAGS)
|
||||||
libgstautoplugcache_la_CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
|
libgststaticautoplugrender_la_LIBADD = $(GST_LIBS)
|
||||||
libgstautoplugger_la_CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS)
|
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_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
|
noinst_HEADERS = gststaticautoplug.h gststaticautoplugrender.h
|
||||||
|
|
||||||
|
|
|
@ -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_DEPENDENCIES = ../libgst.la
|
||||||
libgstelements_la_SOURCES = \
|
libgstelements_la_SOURCES = \
|
||||||
|
@ -17,6 +17,9 @@ libgstelements_la_SOURCES = \
|
||||||
gsttee.c \
|
gsttee.c \
|
||||||
gstaggregator.c \
|
gstaggregator.c \
|
||||||
gststatistics.c
|
gststatistics.c
|
||||||
|
libgstelements_la_CFLAGS = $(GST_CFLAGS)
|
||||||
|
libgstelements_la_LIBADD = $(GST_LIBS)
|
||||||
|
libgstelements_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||||
|
|
||||||
noinst_HEADERS = \
|
noinst_HEADERS = \
|
||||||
gstfakesrc.h \
|
gstfakesrc.h \
|
||||||
|
@ -31,7 +34,3 @@ noinst_HEADERS = \
|
||||||
gstaggregator.h \
|
gstaggregator.h \
|
||||||
gststatistics.h \
|
gststatistics.h \
|
||||||
gstfilesrc.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)
|
|
||||||
|
|
|
@ -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_SOURCES = gstbasicscheduler.c
|
||||||
|
|
||||||
libgstbasicscheduler_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
|
||||||
|
|
||||||
libgstbasicscheduler_la_CFLAGS = $(GST_CFLAGS)
|
libgstbasicscheduler_la_CFLAGS = $(GST_CFLAGS)
|
||||||
|
libgstbasicscheduler_la_LIBADD = $(GST_LIBS)
|
||||||
|
libgstbasicscheduler_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||||
|
|
|
@ -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_SOURCES = gsttypes.c
|
||||||
|
|
||||||
libgsttypes_la_CFLAGS = $(GST_CFLAGS)
|
libgsttypes_la_CFLAGS = $(GST_CFLAGS)
|
||||||
libgsttypes_la_LIBADD = $(GST_LIBS)
|
libgsttypes_la_LIBADD = $(GST_LIBS)
|
||||||
libgsttypes_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
libgsttypes_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
librarydir = $(libdir)/gst
|
librarydir = $(libdir)/gst
|
||||||
|
|
||||||
library_LTLIBRARIES = libgstbytestream.la libgstbstest.la
|
library_LTLIBRARIES = libgstbytestream.la
|
||||||
|
noinst_LTLIBRARIES = libgstbstest.la
|
||||||
libgstbytestream_la_SOURCES = bytestream.c
|
|
||||||
libgstbstest_la_SOURCES = bstest.c
|
|
||||||
|
|
||||||
libgstbytestreamincludedir = $(includedir)/gst/bytestream
|
libgstbytestreamincludedir = $(includedir)/gst/bytestream
|
||||||
libgstbytestreaminclude_HEADERS = bytestream.h
|
libgstbytestreaminclude_HEADERS = bytestream.h
|
||||||
|
|
||||||
libgstbytestream_la_LIBADD = $(GST_LIBS)
|
libgstbytestream_la_SOURCES = bytestream.c
|
||||||
libgstbytestream_la_CFLAGS = $(GST_CFLAGS)
|
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_CFLAGS = $(GST_CFLAGS)
|
||||||
|
libgstbstest_la_LIBADD = $(GST_LIBS)
|
||||||
|
|
|
@ -2,13 +2,6 @@ librarydir = $(libdir)/gst
|
||||||
|
|
||||||
library_LTLIBRARIES = libgstcontrol.la
|
library_LTLIBRARIES = libgstcontrol.la
|
||||||
|
|
||||||
libgstcontrol_la_SOURCES = \
|
|
||||||
control.c \
|
|
||||||
dparammanager.c \
|
|
||||||
dparam.c \
|
|
||||||
dplinearinterp.c
|
|
||||||
|
|
||||||
|
|
||||||
libgstcontrolincludedir = $(includedir)/gst/control
|
libgstcontrolincludedir = $(includedir)/gst/control
|
||||||
libgstcontrolinclude_HEADERS = \
|
libgstcontrolinclude_HEADERS = \
|
||||||
control.h \
|
control.h \
|
||||||
|
@ -17,6 +10,10 @@ libgstcontrolinclude_HEADERS = \
|
||||||
dparamcommon.h \
|
dparamcommon.h \
|
||||||
dplinearinterp.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_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math
|
||||||
|
libgstcontrol_la_LIBADD = $(GST_LIBS)
|
||||||
|
|
|
@ -8,15 +8,14 @@ else
|
||||||
GSTARCH_SRCS =
|
GSTARCH_SRCS =
|
||||||
endif
|
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
|
libgstgetbitsincludedir = $(includedir)/gst/getbits
|
||||||
libgstgetbitsinclude_HEADERS = getbits.h
|
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
|
noinst_HEADERS = getbits.h gstgetbits_inl.h
|
||||||
|
|
||||||
# check_PROGRAMS = gbtest
|
# check_PROGRAMS = gbtest
|
||||||
|
|
||||||
|
|
|
@ -2,12 +2,11 @@ librarydir = $(libdir)/gst
|
||||||
|
|
||||||
library_LTLIBRARIES = libgstputbits.la
|
library_LTLIBRARIES = libgstputbits.la
|
||||||
|
|
||||||
libgstputbits_la_SOURCES = putbits.c
|
|
||||||
|
|
||||||
libgstputbitsincludedir = $(includedir)/gst/putbits
|
libgstputbitsincludedir = $(includedir)/gst/putbits
|
||||||
libgstputbitsinclude_HEADERS = putbits.h
|
libgstputbitsinclude_HEADERS = putbits.h
|
||||||
|
|
||||||
noinst_HEADERS = putbits.h
|
libgstputbits_la_SOURCES = putbits.c
|
||||||
|
|
||||||
libgstputbits_la_LIBADD = $(GST_LIBS)
|
|
||||||
libgstputbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
|
libgstputbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
|
||||||
|
libgstputbits_la_LIBADD = $(GST_LIBS)
|
||||||
|
|
||||||
|
noinst_HEADERS = putbits.h
|
||||||
|
|
|
@ -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_DEPENDENCIES = ../libgst.la
|
||||||
libgstelements_la_SOURCES = \
|
libgstelements_la_SOURCES = \
|
||||||
|
@ -17,6 +17,9 @@ libgstelements_la_SOURCES = \
|
||||||
gsttee.c \
|
gsttee.c \
|
||||||
gstaggregator.c \
|
gstaggregator.c \
|
||||||
gststatistics.c
|
gststatistics.c
|
||||||
|
libgstelements_la_CFLAGS = $(GST_CFLAGS)
|
||||||
|
libgstelements_la_LIBADD = $(GST_LIBS)
|
||||||
|
libgstelements_la_LDFLAGS = -version-info $(GST_LIBVERSION)
|
||||||
|
|
||||||
noinst_HEADERS = \
|
noinst_HEADERS = \
|
||||||
gstfakesrc.h \
|
gstfakesrc.h \
|
||||||
|
@ -31,7 +34,3 @@ noinst_HEADERS = \
|
||||||
gstaggregator.h \
|
gstaggregator.h \
|
||||||
gststatistics.h \
|
gststatistics.h \
|
||||||
gstfilesrc.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)
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
noinst_PROGRAMS = autoplug
|
noinst_PROGRAMS = autoplug
|
||||||
|
|
||||||
autoplug_LDADD = $(GNOME_LIBS) $(GST_LIBS)
|
autoplug_LDADD = $(GST_LIBS) $(GNOME_LIBS)
|
||||||
autoplug_CFLAGS = $(GNOME_CFLAGS) $(GST_CFLAGS)
|
autoplug_CFLAGS = $(GST_CFLAGS) $(GNOME_CFLAGS)
|
||||||
|
|
|
@ -2,4 +2,6 @@ noinst_LTLIBRARIES = libexample.la
|
||||||
|
|
||||||
libexample_la_SOURCES = example.c
|
libexample_la_SOURCES = example.c
|
||||||
libexample_la_CFLAGS = $(GST_CFLAGS)
|
libexample_la_CFLAGS = $(GST_CFLAGS)
|
||||||
|
libexample_la_LIBADD = $(GST_LIBS)
|
||||||
|
|
||||||
noinst_HEADERS = example.h
|
noinst_HEADERS = example.h
|
||||||
|
|
|
@ -5,7 +5,7 @@ testprogs = test1
|
||||||
check_PROGRAMS = $(testprogs)
|
check_PROGRAMS = $(testprogs)
|
||||||
|
|
||||||
test1_SOURCES = test1.c gstbstest.c mem.c
|
test1_SOURCES = test1.c gstbstest.c mem.c
|
||||||
test1_LDFLAGS = $(GST_LIBS) -L$(top_builddir)/libs/gst/bytestream/ -lgstbytestream
|
|
||||||
test1_CFLAGS = $(GST_CFLAGS)
|
test1_CFLAGS = $(GST_CFLAGS)
|
||||||
|
test1_LDFLAGS = $(GST_LIBS) -L$(top_builddir)/libs/gst/bytestream/ -lgstbytestream
|
||||||
|
|
||||||
noinst_HEADERS = mem.h
|
noinst_HEADERS = mem.h
|
||||||
|
|
|
@ -4,6 +4,5 @@ TESTS = $(testprogs)
|
||||||
|
|
||||||
check_PROGRAMS = $(testprogs)
|
check_PROGRAMS = $(testprogs)
|
||||||
|
|
||||||
# we have nothing but apps here, we can do this safely
|
AM_CFLAGS = $(GST_CFLAGS)
|
||||||
LIBS = $(GST_LIBS)
|
LIBS = $(GST_LIBS)
|
||||||
CFLAGS = $(GST_CFLAGS)
|
|
||||||
|
|
|
@ -2,6 +2,9 @@
|
||||||
testprogs = static # dynamic linked loading registry static2
|
testprogs = static # dynamic linked loading registry static2
|
||||||
# filterdir = $(libdir)/gst
|
# filterdir = $(libdir)/gst
|
||||||
|
|
||||||
|
AM_CFLAGS = $(GST_CFLAGS)
|
||||||
|
LIBS = $(GST_LIBS)
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libtestplugin.la libtestplugin2.la
|
noinst_LTLIBRARIES = libtestplugin.la libtestplugin2.la
|
||||||
|
|
||||||
libtestplugin_la_SOURCES = testplugin.c
|
libtestplugin_la_SOURCES = testplugin.c
|
||||||
|
@ -18,7 +21,3 @@ static_SOURCES = static.c testplugin_s.c testplugin2_s.c
|
||||||
TESTS = $(testprogs)
|
TESTS = $(testprogs)
|
||||||
|
|
||||||
check_PROGRAMS = $(testprogs)
|
check_PROGRAMS = $(testprogs)
|
||||||
|
|
||||||
LIBS = $(GST_LIBS)
|
|
||||||
CFLAGS = $(GST_CFLAGS)
|
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ testprogs = test1
|
||||||
check_PROGRAMS = $(testprogs)
|
check_PROGRAMS = $(testprogs)
|
||||||
|
|
||||||
test1_SOURCES = test1.c gstbstest.c mem.c
|
test1_SOURCES = test1.c gstbstest.c mem.c
|
||||||
test1_LDFLAGS = $(GST_LIBS) -L$(top_builddir)/libs/gst/bytestream/ -lgstbytestream
|
|
||||||
test1_CFLAGS = $(GST_CFLAGS)
|
test1_CFLAGS = $(GST_CFLAGS)
|
||||||
|
test1_LDFLAGS = $(GST_LIBS) -L$(top_builddir)/libs/gst/bytestream/ -lgstbytestream
|
||||||
|
|
||||||
noinst_HEADERS = mem.h
|
noinst_HEADERS = mem.h
|
||||||
|
|
|
@ -4,6 +4,5 @@ TESTS = $(testprogs)
|
||||||
|
|
||||||
check_PROGRAMS = $(testprogs)
|
check_PROGRAMS = $(testprogs)
|
||||||
|
|
||||||
# we have nothing but apps here, we can do this safely
|
AM_CFLAGS = $(GST_CFLAGS)
|
||||||
LIBS = $(GST_LIBS)
|
LIBS = $(GST_LIBS)
|
||||||
CFLAGS = $(GST_CFLAGS)
|
|
||||||
|
|
|
@ -2,6 +2,9 @@
|
||||||
testprogs = static # dynamic linked loading registry static2
|
testprogs = static # dynamic linked loading registry static2
|
||||||
# filterdir = $(libdir)/gst
|
# filterdir = $(libdir)/gst
|
||||||
|
|
||||||
|
AM_CFLAGS = $(GST_CFLAGS)
|
||||||
|
LIBS = $(GST_LIBS)
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libtestplugin.la libtestplugin2.la
|
noinst_LTLIBRARIES = libtestplugin.la libtestplugin2.la
|
||||||
|
|
||||||
libtestplugin_la_SOURCES = testplugin.c
|
libtestplugin_la_SOURCES = testplugin.c
|
||||||
|
@ -18,7 +21,3 @@ static_SOURCES = static.c testplugin_s.c testplugin2_s.c
|
||||||
TESTS = $(testprogs)
|
TESTS = $(testprogs)
|
||||||
|
|
||||||
check_PROGRAMS = $(testprogs)
|
check_PROGRAMS = $(testprogs)
|
||||||
|
|
||||||
LIBS = $(GST_LIBS)
|
|
||||||
CFLAGS = $(GST_CFLAGS)
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue