mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-03 14:08:56 +00:00
revert part of wingo's patch wingo, I'm not doing this to piss you off ;) but with your change we get the reverse iss...
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 ;)
This commit is contained in:
parent
7305565829
commit
3758abca8d
2 changed files with 7 additions and 1 deletions
|
@ -19,7 +19,7 @@ else
|
||||||
SUBDIRS_EXAMPLES =
|
SUBDIRS_EXAMPLES =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SUBDIRS = include libs gst tools \
|
SUBDIRS = include gst libs 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
|
||||||
|
|
|
@ -11,3 +11,9 @@ 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
|
||||||
libgststandardscheduler_la_LDFLAGS = @GST_LT_LDFLAGS@
|
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
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue