From: Thomas Vander Stichele Date: Tue, 13 Aug 2002 22:30:46 +0000 (+0000) Subject: more nonsrcdir build fixes X-Git-Tag: BRANCH-RELEASE-0_4_1-ROOT~85 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5921d35a6738b6e6f3b116092486b2b3c7b2def0;p=platform%2Fupstream%2Fgstreamer.git more nonsrcdir build fixes Original commit message from CVS: more nonsrcdir build fixes --- diff --git a/gst/schedulers/Makefile.am b/gst/schedulers/Makefile.am index 64d5d94..17f87931 100644 --- a/gst/schedulers/Makefile.am +++ b/gst/schedulers/Makefile.am @@ -7,8 +7,14 @@ libgstbasicscheduler_la_CFLAGS = $(GST_CFLAGS) -D_COTHREADS_BASIC libgstbasicscheduler_la_LIBADD = ../libcothreads.la libgstbasicscheduler_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 ! libgststandardscheduler_la_SOURCES = gstbasicscheduler.c -libgststandardscheduler_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/libs/ext/cothreads -D_COTHREADS_STANDARD +libgststandardscheduler_la_CFLAGS = $(GST_CFLAGS) -D_COTHREADS_STANDARD +libgststandardscheduler_la_CFLAGS += -I$(top_builddir)/libs/ext/cothreads +libgststandardscheduler_la_CFLAGS += -I$(top_srcdir)/libs/ext/cothreads + libgststandardscheduler_la_LIBADD = $(top_builddir)/libs/ext/cothreads/cothreads/libcothreads-gthreads.la libgststandardscheduler_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) @@ -18,7 +24,9 @@ libgstfastbasicscheduler_la_LIBADD = ../libcothreads.la libgstfastbasicscheduler_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstfaststandardscheduler_la_SOURCES = gstfastscheduler.c -libgstfaststandardscheduler_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/libs/ext/cothreads -D_COTHREADS_STANDARD +libgstfaststandardscheduler_la_CFLAGS = $(GST_CFLAGS) -D_COTHREADS_STANDARD +libgstfaststandardscheduler_la_CFLAGS += -I$(top_builddir)/libs/ext/cothreads +libgstfaststandardscheduler_la_CFLAGS += -I$(top_srcdir)/libs/ext/cothreads libgstfaststandardscheduler_la_LIBADD = $(top_builddir)/libs/ext/cothreads/cothreads/libcothreads-gthreads.la libgstfaststandardscheduler_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)