From 58a92964c6e4333953b33108591eb982b3237816 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 19 Mar 2010 01:00:36 +0000 Subject: [PATCH] build: Makefile.am fixes Mostly just add missing $(GST_BASE_CFLAGS), but also fix up order of flags (see docs/random/moving-plugins). --- ext/cdparanoia/Makefile.am | 2 +- ext/gio/Makefile.am | 2 +- ext/gnomevfs/Makefile.am | 2 +- ext/libvisual/Makefile.am | 2 +- ext/ogg/Makefile.am | 3 ++- gst-libs/gst/app/Makefile.am | 4 ++-- gst-libs/gst/audio/Makefile.am | 2 +- gst-libs/gst/interfaces/Makefile.am | 3 ++- gst-libs/gst/video/Makefile.am | 2 +- gst/ffmpegcolorspace/Makefile.am | 4 ++-- gst/tcp/Makefile.am | 2 +- gst/videotestsrc/Makefile.am | 4 ++-- sys/v4l/Makefile.am | 2 +- tests/examples/app/Makefile.am | 16 ++++++++-------- tests/examples/overlay/Makefile.am | 6 +++--- tests/icles/Makefile.am | 13 ++++++++----- 16 files changed, 37 insertions(+), 32 deletions(-) diff --git a/ext/cdparanoia/Makefile.am b/ext/cdparanoia/Makefile.am index aef3581..3b9452f 100644 --- a/ext/cdparanoia/Makefile.am +++ b/ext/cdparanoia/Makefile.am @@ -1,7 +1,7 @@ plugin_LTLIBRARIES = libgstcdparanoia.la libgstcdparanoia_la_SOURCES = gstcdparanoiasrc.c -libgstcdparanoia_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstcdparanoia_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstcdparanoia_la_LIBADD = \ $(top_builddir)/gst-libs/gst/cdda/libgstcdda-$(GST_MAJORMINOR).la \ $(GST_BASE_LIBS) \ diff --git a/ext/gio/Makefile.am b/ext/gio/Makefile.am index 237cfdd..f4b1611 100644 --- a/ext/gio/Makefile.am +++ b/ext/gio/Makefile.am @@ -12,7 +12,7 @@ libgstgio_la_SOURCES = \ gstgiostreamsink.c \ gstgiostreamsrc.c -libgstgio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS) +libgstgio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS) libgstgio_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS) libgstgio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GIO_LDFLAGS) libgstgio_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/gnomevfs/Makefile.am b/ext/gnomevfs/Makefile.am index f87a94b..ed18d39 100644 --- a/ext/gnomevfs/Makefile.am +++ b/ext/gnomevfs/Makefile.am @@ -7,7 +7,7 @@ libgstgnomevfs_la_SOURCES = \ gstgnomevfsuri.c libgstgnomevfs_la_CFLAGS = \ - $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GNOME_VFS_CFLAGS) + $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GNOME_VFS_CFLAGS) libgstgnomevfs_la_LIBADD = \ $(top_builddir)/gst-libs/gst/tag/libgsttag-$(GST_MAJORMINOR).la \ $(GST_BASE_LIBS) $(GNOME_VFS_LIBS) diff --git a/ext/libvisual/Makefile.am b/ext/libvisual/Makefile.am index d5d0213..839900e 100644 --- a/ext/libvisual/Makefile.am +++ b/ext/libvisual/Makefile.am @@ -1,7 +1,7 @@ plugin_LTLIBRARIES = libgstlibvisual.la libgstlibvisual_la_SOURCES = visual.c -libgstlibvisual_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBVISUAL_CFLAGS) +libgstlibvisual_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBVISUAL_CFLAGS) libgstlibvisual_la_LIBADD = $(GST_BASE_LIBS) $(LIBVISUAL_LIBS) libgstlibvisual_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstlibvisual_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/ogg/Makefile.am b/ext/ogg/Makefile.am index 1a7f319..77d48f4 100644 --- a/ext/ogg/Makefile.am +++ b/ext/ogg/Makefile.am @@ -17,11 +17,12 @@ libgstogg_la_SOURCES = \ noinst_HEADERS = \ gstoggdemux.h gstoggmux.h -libgstogg_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(OGG_CFLAGS) +libgstogg_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(OGG_CFLAGS) libgstogg_la_LIBADD = \ $(top_builddir)/gst-libs/gst/riff/libgstriff-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/tag/libgsttag-$(GST_MAJORMINOR).la \ $(GST_BASE_LIBS) \ + $(GST_LIBS) \ $(OGG_LIBS) libgstogg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstogg_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am index 1c5c064..c58f325 100644 --- a/gst-libs/gst/app/Makefile.am +++ b/gst-libs/gst/app/Makefile.am @@ -15,8 +15,8 @@ nodist_libgstapp_@GST_MAJORMINOR@_la_SOURCES = \ $(built_sources) libgstapp_@GST_MAJORMINOR@_la_SOURCES = gstappsrc.c gstappbuffer.c gstappsink.c -libgstapp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) +libgstapp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstapp_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) libgstapp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) libgstapp_@GST_MAJORMINOR@_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index 26f2115..669d808 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -45,7 +45,7 @@ libgstaudio_@GST_MAJORMINOR@include_HEADERS = \ nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS = \ audio-enumtypes.h -libgstaudio_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstaudio_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstaudio_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am index a172bb3..340569d 100644 --- a/gst-libs/gst/interfaces/Makefile.am +++ b/gst-libs/gst/interfaces/Makefile.am @@ -56,7 +56,8 @@ nodist_libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \ $(built_sources) \ interfaces-marshal.h -libgstinterfaces_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +# only need base cflags here, xoverlay includes videosink.h for a struct */ +libgstinterfaces_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(LIBM) libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index 79d77c3..9921b2e 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -21,7 +21,7 @@ libgstvideo_@GST_MAJORMINOR@include_HEADERS = \ video.h gstvideosink.h gstvideofilter.h nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS = $(built_headers) -libgstvideo_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstvideo_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstvideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/gst/ffmpegcolorspace/Makefile.am b/gst/ffmpegcolorspace/Makefile.am index 053b423..f12f8cf 100644 --- a/gst/ffmpegcolorspace/Makefile.am +++ b/gst/ffmpegcolorspace/Makefile.am @@ -8,9 +8,9 @@ libgstffmpegcolorspace_la_SOURCES = \ utils.c \ imgconvert.c -libgstffmpegcolorspace_la_CFLAGS = $(GST_CFLAGS) +libgstffmpegcolorspace_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstffmpegcolorspace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstffmpegcolorspace_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) +libgstffmpegcolorspace_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) libgstffmpegcolorspace_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = \ diff --git a/gst/tcp/Makefile.am b/gst/tcp/Makefile.am index 02bc526..c3ed8bd 100644 --- a/gst/tcp/Makefile.am +++ b/gst/tcp/Makefile.am @@ -24,7 +24,7 @@ nodist_libgsttcp_la_SOURCES = \ $(built_sources) # remove ENABLE_NEW when dataprotocol is stable -libgsttcp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -DGST_ENABLE_NEW +libgsttcp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_GDP_CFLAGS) $(GST_CFLAGS) -DGST_ENABLE_NEW libgsttcp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgsttcp_la_LIBADD = $(GST_BASE_LIBS) $(GST_GDP_LIBS) $(GST_LIBS) libgsttcp_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/videotestsrc/Makefile.am b/gst/videotestsrc/Makefile.am index 9403a11..83b689b 100644 --- a/gst/videotestsrc/Makefile.am +++ b/gst/videotestsrc/Makefile.am @@ -4,9 +4,9 @@ libgstvideotestsrc_la_SOURCES = \ gstvideotestsrc.c \ videotestsrc.c -libgstvideotestsrc_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS) +libgstvideotestsrc_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS) libgstvideotestsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstvideotestsrc_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(LIBOIL_LIBS) +libgstvideotestsrc_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBOIL_LIBS) libgstvideotestsrc_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstvideotestsrc.h videotestsrc.h diff --git a/sys/v4l/Makefile.am b/sys/v4l/Makefile.am index 688ec96..5f2b95f 100644 --- a/sys/v4l/Makefile.am +++ b/sys/v4l/Makefile.am @@ -22,7 +22,7 @@ libgstvideo4linux_la_SOURCES = \ # gstv4lmjpegsink.c v4lmjpegsink_calls.c libgstvideo4linux_la_CFLAGS = \ - $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) \ $(GUDEV_CFLAGS) libgstvideo4linux_la_LIBADD = \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ diff --git a/tests/examples/app/Makefile.am b/tests/examples/app/Makefile.am index 7d721b4..11125be 100644 --- a/tests/examples/app/Makefile.am +++ b/tests/examples/app/Makefile.am @@ -3,29 +3,29 @@ noinst_PROGRAMS = appsrc_ex appsrc-stream appsrc-stream2 appsrc-ra \ appsrc-seekable appsink-src appsrc_ex_SOURCES = appsrc_ex.c -appsrc_ex_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +appsrc_ex_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) appsrc_ex_LDFLAGS = \ - $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \ - $(GST_LIBS) + $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \ + $(GST_BASE_LIBS) $(GST_LIBS) appsrc_stream_SOURCES = appsrc-stream.c -appsrc_stream_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +appsrc_stream_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) appsrc_stream_LDFLAGS = $(GST_LIBS) appsrc_stream2_SOURCES = appsrc-stream2.c -appsrc_stream2_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +appsrc_stream2_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) appsrc_stream2_LDFLAGS = $(GST_LIBS) appsrc_ra_SOURCES = appsrc-ra.c -appsrc_ra_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +appsrc_ra_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) appsrc_ra_LDFLAGS = $(GST_LIBS) appsrc_seekable_SOURCES = appsrc-seekable.c -appsrc_seekable_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +appsrc_seekable_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) appsrc_seekable_LDFLAGS = $(GST_LIBS) appsink_src_SOURCES = appsink-src.c -appsink_src_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +appsink_src_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) appsink_src_LDFLAGS = \ $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \ $(GST_LIBS) diff --git a/tests/examples/overlay/Makefile.am b/tests/examples/overlay/Makefile.am index 42bd2e2..68576a3 100644 --- a/tests/examples/overlay/Makefile.am +++ b/tests/examples/overlay/Makefile.am @@ -6,7 +6,7 @@ if HAVE_GTK_X11 EXAMPLES += gtk-xoverlay gtk_xoverlay_SOURCES = gtk-xoverlay.c -gtk_xoverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) +gtk_xoverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) gtk_xoverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la endif @@ -15,7 +15,7 @@ if HAVE_QT EXAMPLES += qt-xoverlay qt_xoverlay_SOURCES = qt-xoverlay.cpp -qt_xoverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS) +qt_xoverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS) qt_xoverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS) \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la @@ -25,7 +25,7 @@ if HAVE_QT_GV EXAMPLES += qtgv-xoverlay qtgv_xoverlay_SOURCES = qtgv-xoverlay.cpp qtgv-xoverlay.h -qtgv_xoverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS) +qtgv_xoverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS) qtgv_xoverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS) \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am index 6923e6d..ce3c6a1 100644 --- a/tests/icles/Makefile.am +++ b/tests/icles/Makefile.am @@ -2,7 +2,8 @@ if USE_X X_TESTS = stress-xoverlay stress_xoverlay_SOURCES = stress-xoverlay.c -stress_xoverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) +stress_xoverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) stress_xoverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la @@ -10,12 +11,14 @@ if HAVE_GTK_X11 X_TESTS += test-colorkey test-xoverlay test_colorkey_SOURCES = test-colorkey.c -test_colorkey_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) +test_colorkey_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) test_colorkey_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la test_xoverlay_SOURCES = test-xoverlay.c -test_xoverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) +test_xoverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) test_xoverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la endif @@ -36,8 +39,8 @@ PANGO_TESTS = endif audio_trickplay_SOURCES = audio-trickplay.c -audio_trickplay_CFLAGS = $(GST_CFLAGS) -audio_trickplay_LDADD = $(GST_LIBS) -lgstcontroller-$(GST_MAJORMINOR) $(LIBM) +audio_trickplay_CFLAGS = $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) +audio_trickplay_LDADD = $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(LIBM) playbin_text_SOURCES = playbin-text.c playbin_text_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -- 2.7.4