From 590d364baa45923cb2e27c706913604c0d61a239 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Sun, 27 Jul 2003 05:10:42 +0000 Subject: [PATCH] Removed building of ext/cothreads and corresponding scheduler. If you want to reenable it, please fix it first. (Se... Original commit message from CVS: Removed building of ext/cothreads and corresponding scheduler. If you want to reenable it, please fix it first. (See bug #87163) --- configure.ac | 1 - gst/schedulers/Makefile.am | 26 +------------------------- libs/ext/Makefile.am | 4 ++-- 3 files changed, 3 insertions(+), 28 deletions(-) diff --git a/configure.ac b/configure.ac index b1d5c1a..1866293 100644 --- a/configure.ac +++ b/configure.ac @@ -480,7 +480,6 @@ AC_SUBST(GST_LIBS, "$LIBGST_LIBS $GST_INT_LIBS") GST_PLUGIN_LDFLAGS="-module -avoid-version" AC_SUBST(GST_PLUGIN_LDFLAGS, "$GST_PLUGIN_LDFLAGS") -AC_CONFIG_SUBDIRS(libs/ext/cothreads) dnl ################################################## dnl # deps for examples from manual # diff --git a/gst/schedulers/Makefile.am b/gst/schedulers/Makefile.am index d4b94f6..1c02a31 100644 --- a/gst/schedulers/Makefile.am +++ b/gst/schedulers/Makefile.am @@ -3,11 +3,9 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = \ libgstbasicomegascheduler.la \ libgstbasicgthreadscheduler.la \ - libgstbasicwingoscheduler.la \ libgstoptscheduler.la \ libgstoptomegascheduler.la \ - libgstoptgthreadscheduler.la \ - libgstoptwingoscheduler.la + libgstoptgthreadscheduler.la libgstbasicomegascheduler_la_SOURCES = gstbasicscheduler.c libgstbasicomegascheduler_la_CFLAGS = $(GST_CFLAGS) -D_COTHREADS_OMEGA @@ -18,16 +16,6 @@ libgstbasicgthreadscheduler_la_SOURCES = gstbasicscheduler.c libgstbasicgthreadscheduler_la_CFLAGS = $(GST_CFLAGS) -D_COTHREADS_GTHREAD libgstbasicgthreadscheduler_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -# some silly bug prevents us from putting both $(top_builddir) and -# $(src_dir) on the same line for CFLAGS (try it, reverse them, see the -# strangeness on your gcc line) so we pull this dirty += trick on it, hah ! -libgstbasicwingoscheduler_la_SOURCES = gstbasicscheduler.c -libgstbasicwingoscheduler_la_CFLAGS = $(GST_CFLAGS) -D_COTHREADS_WINGO -libgstbasicwingoscheduler_la_CFLAGS += -I$(top_builddir)/libs/ext/cothreads -libgstbasicwingoscheduler_la_CFLAGS += -I$(top_srcdir)/libs/ext/cothreads -libgstbasicwingoscheduler_la_LIBADD = $(top_builddir)/libs/ext/cothreads/cothreads/libcothreads-gthreads.la -libgstbasicwingoscheduler_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) - libgstoptscheduler_la_SOURCES = gstoptimalscheduler.c libgstoptscheduler_la_CFLAGS = $(GST_CFLAGS) libgstoptscheduler_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) @@ -41,16 +29,4 @@ libgstoptgthreadscheduler_la_SOURCES = gstoptimalscheduler.c libgstoptgthreadscheduler_la_CFLAGS = $(GST_CFLAGS) -D_COTHREADS_GTHREAD -DUSE_COTHREADS libgstoptgthreadscheduler_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstoptwingoscheduler_la_SOURCES = gstoptimalscheduler.c -libgstoptwingoscheduler_la_CFLAGS = $(GST_CFLAGS) -D_COTHREADS_WINGO -DUSE_COTHREADS -libgstoptwingoscheduler_la_CFLAGS += -I$(top_builddir)/libs/ext/cothreads -libgstoptwingoscheduler_la_CFLAGS += -I$(top_srcdir)/libs/ext/cothreads -libgstoptwingoscheduler_la_LIBADD = $(top_builddir)/libs/ext/cothreads/cothreads/libcothreads-gthreads.la -libgstoptwingoscheduler_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) - -## this is a REALLY evil hack -## but we need to keep it as long as we have libs/gst and libs/ext -$(top_builddir)/libs/ext/cothreads/cothreads/libcothreads-gthreads.la: - cd $(top_builddir)/libs/ext/cothreads/cothreads && ${MAKE} - noinst_HEADERS = cothreads_compat.h gthread-cothreads.h diff --git a/libs/ext/Makefile.am b/libs/ext/Makefile.am index 9694df1..057dcdf 100644 --- a/libs/ext/Makefile.am +++ b/libs/ext/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = cothreads +SUBDIRS = -DIST_SUBDIRS = cothreads +DIST_SUBDIRS = -- 2.7.4