mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext: Fix CFLAGS order

Browse source 
We'd pick up system-wide ffmpeg headers otherwise
This commit is contained in:
Edward Hervey 2010-07-05 15:48:06 +02:00
parent 1d0b29414a
commit 00e177458c
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ext/ffmpeg/Makefile.am
View file

@ -20,8 +20,7 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \
# \ # \
# gstffmpegscale.c # gstffmpegscale.c
libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ libgstffmpeg_la_CFLAGS = $(FFMPEG_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
$(FFMPEG_CFLAGS)
libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LIBM) $(WIN32_LIBS) -lz $(BZ2_LIBS) libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LIBM) $(WIN32_LIBS) -lz $(BZ2_LIBS)
libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS) libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
libgstffmpeg_la_LIBTOOLFLAGS = --tag=disable-static libgstffmpeg_la_LIBTOOLFLAGS = --tag=disable-static

3
ext/libpostproc/Makefile.am
View file

@ -2,8 +2,7 @@ plugin_LTLIBRARIES = libgstpostproc.la
libgstpostproc_la_SOURCES = gstpostproc.c libgstpostproc_la_SOURCES = gstpostproc.c
libgstpostproc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS) \ libgstpostproc_la_CFLAGS = $(POSTPROC_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
$(POSTPROC_CFLAGS)
libgstpostproc_la_LIBADD = -lgstvideo-@GST_MAJORMINOR@ \ libgstpostproc_la_LIBADD = -lgstvideo-@GST_MAJORMINOR@ \
$(POSTPROC_LIBS) \ $(POSTPROC_LIBS) \
$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(ORC_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(ORC_LIBS)

5
ext/libswscale/Makefile.am
View file

@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgstffmpegscale.la
libgstffmpegscale_la_SOURCES = gstffmpegscale.c libgstffmpegscale_la_SOURCES = gstffmpegscale.c
libgstffmpegscale_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ libgstffmpegscale_la_CFLAGS = $(SWSCALE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \ $(ORC_CFLAGS)
$(ORC_CFLAGS) $(SWSCALE_CFLAGS)
libgstffmpegscale_la_LIBADD = $(SWSCALE_LIBS) \ libgstffmpegscale_la_LIBADD = $(SWSCALE_LIBS) \
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
$(GST_BASE_LIBS) $(ORC_LIBS) $(LIBM) -lz $(GST_BASE_LIBS) $(ORC_LIBS) $(LIBM) -lz