mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 19:51:11 +00:00
fix funny build issue by not linking plugin libraries to gstreamer core. this is because they are plugins, not shared...
Original commit message from CVS: fix funny build issue by not linking plugin libraries to gstreamer core. this is because they are plugins, not shared libraries per se, and will only be loaded by the core itself. this change allows the core elements (schedulers, autopluggers, etc) to use the core loadable libraries (bytestream, getbits, etc) as well as "ext" libs like the new cothreads package.
This commit is contained in:
parent
70834db6ad
commit
7305565829
6 changed files with 2 additions and 11 deletions
|
@ -19,11 +19,11 @@ else
|
||||||
SUBDIRS_EXAMPLES =
|
SUBDIRS_EXAMPLES =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SUBDIRS = include gst libs tools \
|
SUBDIRS = include libs gst tools \
|
||||||
$(SUBDIRS_TESTS) $(SUBDIRS_EXAMPLES) $(SUBDIRS_DOCS)
|
$(SUBDIRS_TESTS) $(SUBDIRS_EXAMPLES) $(SUBDIRS_DOCS)
|
||||||
|
|
||||||
# These are all the possible subdirs
|
# These are all the possible subdirs
|
||||||
DIST_SUBDIRS = include gst libs tools tests testsuite examples docs
|
DIST_SUBDIRS = include libs gst tools tests testsuite examples docs
|
||||||
|
|
||||||
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
|
|
|
@ -7,10 +7,6 @@ libgstbasicscheduler_la_CFLAGS = $(GST_CFLAGS)
|
||||||
libgstbasicscheduler_la_LIBADD = $(GST_LIBS) ../libcothreads.la
|
libgstbasicscheduler_la_LIBADD = $(GST_LIBS) ../libcothreads.la
|
||||||
libgstbasicscheduler_la_LDFLAGS = @GST_LT_LDFLAGS@
|
libgstbasicscheduler_la_LDFLAGS = @GST_LT_LDFLAGS@
|
||||||
|
|
||||||
## this is a REALLY evil hack which we need to get rid of as soon as possible !
|
|
||||||
$(top_builddir)/libs/ext/cothreads/cothreads/libcothreads-gthreads.la:
|
|
||||||
cd $(top_builddir)/libs/ext/cothreads/cothreads && make
|
|
||||||
|
|
||||||
libgststandardscheduler_la_SOURCES = gststandardscheduler.c
|
libgststandardscheduler_la_SOURCES = gststandardscheduler.c
|
||||||
libgststandardscheduler_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/libs/ext/cothreads
|
libgststandardscheduler_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/libs/ext/cothreads
|
||||||
libgststandardscheduler_la_LIBADD = $(GST_LIBS) $(top_builddir)/libs/ext/cothreads/cothreads/libcothreads-gthreads.la
|
libgststandardscheduler_la_LIBADD = $(GST_LIBS) $(top_builddir)/libs/ext/cothreads/cothreads/libcothreads-gthreads.la
|
||||||
|
|
|
@ -8,9 +8,7 @@ libgstbytestreaminclude_HEADERS = bytestream.h
|
||||||
|
|
||||||
libgstbytestream_la_SOURCES = bytestream.c
|
libgstbytestream_la_SOURCES = bytestream.c
|
||||||
libgstbytestream_la_CFLAGS = $(GST_CFLAGS)
|
libgstbytestream_la_CFLAGS = $(GST_CFLAGS)
|
||||||
libgstbytestream_la_LIBADD = $(GST_LIBS)
|
|
||||||
libgstbytestream_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@
|
libgstbytestream_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@
|
||||||
|
|
||||||
libgstbstest_la_SOURCES = bstest.c
|
libgstbstest_la_SOURCES = bstest.c
|
||||||
libgstbstest_la_CFLAGS = $(GST_CFLAGS)
|
libgstbstest_la_CFLAGS = $(GST_CFLAGS)
|
||||||
libgstbstest_la_LIBADD = $(GST_LIBS)
|
|
||||||
|
|
|
@ -17,5 +17,4 @@ libgstcontrol_la_SOURCES = \
|
||||||
dplinearinterp.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)
|
|
||||||
libgstcontrol_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@
|
libgstcontrol_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@
|
||||||
|
|
|
@ -15,7 +15,6 @@ libgstgetbits_la_SOURCES = getbits.c gstgetbits_inl.h gstgetbits_generic.c $(GST
|
||||||
EXTRA_libgstgetbits_la_SOURCES = gstgetbits_i386.s
|
EXTRA_libgstgetbits_la_SOURCES = gstgetbits_i386.s
|
||||||
|
|
||||||
libgstgetbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
|
libgstgetbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
|
||||||
libgstgetbits_la_LIBADD = $(GST_LIBS)
|
|
||||||
libgstgetbits_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@
|
libgstgetbits_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@
|
||||||
|
|
||||||
noinst_HEADERS = getbits.h gstgetbits_inl.h
|
noinst_HEADERS = getbits.h gstgetbits_inl.h
|
||||||
|
|
|
@ -7,7 +7,6 @@ libgstputbitsinclude_HEADERS = putbits.h
|
||||||
|
|
||||||
libgstputbits_la_SOURCES = putbits.c
|
libgstputbits_la_SOURCES = putbits.c
|
||||||
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)
|
|
||||||
libgstputbits_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@
|
libgstputbits_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@
|
||||||
|
|
||||||
noinst_HEADERS = putbits.h
|
noinst_HEADERS = putbits.h
|
||||||
|
|
Loading…
Reference in a new issue