revert part of wingo's patch wingo, I'm not doing this to piss you off ;) but with...

Original commit message from CVS:
revert part of wingo's patch
wingo, I'm not doing this to piss you off ;)
but with your change we get the reverse issue : stuff in libs/gst needs
gstmarshal.[ch], which are only generated if we go in gst before libs.
So unless we just throw the egg at the chicken we'll have to settle for a
hack.
Alternatively, we could take the egg out of the chicken and put it in
a separate tarball which would then be installed ;)

diff --git a/Makefile.am b/Makefile.am
index d05c175..d93a4c6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ else
 SUBDIRS_EXAMPLES =
 endif
 
-SUBDIRS = include libs gst tools \
+SUBDIRS = include gst libs tools \
        $(SUBDIRS_TESTS) $(SUBDIRS_EXAMPLES) $(SUBDIRS_DOCS)
 
 # These are all the possible subdirs

diff --git a/gst/schedulers/Makefile.am b/gst/schedulers/Makefile.am
index b92ba76..67e43c8 100644 (file)
--- a/gst/schedulers/Makefile.am
+++ b/gst/schedulers/Makefile.am
@@ -11,3 +11,9 @@ libgststandardscheduler_la_SOURCES = gststandardscheduler.c
 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_LDFLAGS = @GST_LT_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
+