From 073201b329e06cda872670462bb6acf129bb61ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 18 Mar 2010 21:14:17 +0000 Subject: [PATCH] build: Makefile.am cleanups Mostly add $(GST_BASE_CFLAGS) where it was missing, but also fix up order of flags and libs if needed (see docs/random/moving-plugins). --- ext/dv/Makefile.am | 4 ++-- ext/esd/Makefile.am | 4 +++- ext/libcaca/Makefile.am | 3 ++- ext/pulse/Makefile.am | 5 +++-- ext/shout2/Makefile.am | 2 +- ext/speex/Makefile.am | 1 + ext/wavpack/Makefile.am | 6 ++++-- gst/auparse/Makefile.am | 2 +- gst/avi/Makefile.am | 3 +-- gst/flx/Makefile.am | 4 ++-- gst/icydemux/Makefile.am | 4 ++-- gst/interleave/Makefile.am | 4 ++-- gst/matroska/Makefile.am | 3 +-- gst/qtdemux/Makefile.am | 4 ++-- gst/replaygain/Makefile.am | 5 +++-- gst/rtp/Makefile.am | 9 +++++---- gst/udp/Makefile.am | 6 +++--- gst/videomixer/Makefile.am | 6 ++++-- gst/wavparse/Makefile.am | 8 ++++---- sys/directsound/Makefile.am | 18 ++++++++++++------ sys/oss/Makefile.am | 3 ++- sys/waveform/Makefile.am | 9 ++++++--- tests/examples/v4l2/Makefile.am | 4 ++-- 23 files changed, 68 insertions(+), 49 deletions(-) diff --git a/ext/dv/Makefile.am b/ext/dv/Makefile.am index a931fdb65..928d47592 100644 --- a/ext/dv/Makefile.am +++ b/ext/dv/Makefile.am @@ -1,10 +1,10 @@ plugin_LTLIBRARIES = libgstdv.la libgstdv_la_SOURCES = gstdv.c gstdvdec.c gstdvdemux.c -libgstdv_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBDV_CFLAGS) +libgstdv_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBDV_CFLAGS) libgstdv_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ - $(GST_BASE_LIBS) $(LIBDV_LIBS) + $(GST_BASE_LIBS) $(GST_LIBS) $(LIBDV_LIBS) libgstdv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdv_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/esd/Makefile.am b/ext/esd/Makefile.am index e7b864de0..a7a1464b3 100644 --- a/ext/esd/Makefile.am +++ b/ext/esd/Makefile.am @@ -1,9 +1,11 @@ plugin_LTLIBRARIES = libgstesd.la libgstesd_la_SOURCES = esdsink.c gstesd.c -libgstesd_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ESD_CFLAGS) +libgstesd_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ESD_CFLAGS) libgstesd_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ + $(GST_BASE_LIBS) \ + $(GST_LIBS) \ $(ESD_LIBS) libgstesd_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstesd_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/libcaca/Makefile.am b/ext/libcaca/Makefile.am index e3101789b..e44c0488f 100644 --- a/ext/libcaca/Makefile.am +++ b/ext/libcaca/Makefile.am @@ -3,11 +3,12 @@ plugin_LTLIBRARIES = libgstcacasink.la libgstcacasink_la_SOURCES = gstcacasink.c libgstcacasink_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) \ $(LIBCACA_CFLAGS) libgstcacasink_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) \ $(GST_BASE_LIBS) \ + $(GST_LIBS) \ $(LIBCACA_LIBS) libgstcacasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstcacasink_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/pulse/Makefile.am b/ext/pulse/Makefile.am index c639b1f7b..9c0d6b717 100644 --- a/ext/pulse/Makefile.am +++ b/ext/pulse/Makefile.am @@ -10,8 +10,9 @@ libgstpulse_la_SOURCES = \ pulsesrc.c \ pulseutil.c -libgstpulse_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(PULSE_CFLAGS) -libgstpulse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) $(PULSE_LIBS) +libgstpulse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(PULSE_CFLAGS) +libgstpulse_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ + -lgstinterfaces-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_LIBS) $(PULSE_LIBS) libgstpulse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstpulse_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/shout2/Makefile.am b/ext/shout2/Makefile.am index df7cc3828..4cb3f7cb9 100644 --- a/ext/shout2/Makefile.am +++ b/ext/shout2/Makefile.am @@ -1,7 +1,7 @@ plugin_LTLIBRARIES = libgstshout2.la libgstshout2_la_SOURCES = gstshout2.c -libgstshout2_la_CFLAGS = $(GST_CFLAGS) $(SHOUT2_CFLAGS) +libgstshout2_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SHOUT2_CFLAGS) libgstshout2_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(SHOUT2_LIBS) libgstshout2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstshout2_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/speex/Makefile.am b/ext/speex/Makefile.am index 80abe5e31..f2efb3614 100644 --- a/ext/speex/Makefile.am +++ b/ext/speex/Makefile.am @@ -3,6 +3,7 @@ plugin_LTLIBRARIES = libgstspeex.la libgstspeex_la_SOURCES = gstspeex.c gstspeexdec.c gstspeexenc.c libgstspeex_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) \ $(SPEEX_CFLAGS) libgstspeex_la_LIBADD = \ diff --git a/ext/wavpack/Makefile.am b/ext/wavpack/Makefile.am index 867700410..70d243146 100644 --- a/ext/wavpack/Makefile.am +++ b/ext/wavpack/Makefile.am @@ -8,8 +8,10 @@ libgstwavpack_la_SOURCES = \ gstwavpackenc.c \ gstwavpackstreamreader.c -libgstwavpack_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(WAVPACK_CFLAGS) -libgstwavpack_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(WAVPACK_LIBS) +libgstwavpack_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(WAVPACK_CFLAGS) +libgstwavpack_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ + $(GST_BASE_LIBS) $(GST_LIBS) $(WAVPACK_LIBS) libgstwavpack_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstwavpack_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/auparse/Makefile.am b/gst/auparse/Makefile.am index 2862f9fa6..08b319346 100644 --- a/gst/auparse/Makefile.am +++ b/gst/auparse/Makefile.am @@ -1,7 +1,7 @@ plugin_LTLIBRARIES = libgstauparse.la libgstauparse_la_SOURCES = gstauparse.c -libgstauparse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstauparse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstauparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) libgstauparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstauparse_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/avi/Makefile.am b/gst/avi/Makefile.am index dd2af830d..37742097f 100644 --- a/gst/avi/Makefile.am +++ b/gst/avi/Makefile.am @@ -12,8 +12,7 @@ noinst_HEADERS = \ gstavidemux.h \ gstavisubtitle.h -libgstavi_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ - -I$(top_srcdir)/gst-libs +libgstavi_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstavi_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ $(GST_BASE_LIBS) \ diff --git a/gst/flx/Makefile.am b/gst/flx/Makefile.am index 7a4504939..38ed6818d 100644 --- a/gst/flx/Makefile.am +++ b/gst/flx/Makefile.am @@ -1,8 +1,8 @@ plugin_LTLIBRARIES = libgstflxdec.la libgstflxdec_la_SOURCES = gstflxdec.c flx_color.c -libgstflxdec_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -libgstflxdec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) +libgstflxdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) +libgstflxdec_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) libgstflxdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstflxdec_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/icydemux/Makefile.am b/gst/icydemux/Makefile.am index 1905b23c7..167dd628b 100644 --- a/gst/icydemux/Makefile.am +++ b/gst/icydemux/Makefile.am @@ -1,8 +1,8 @@ plugin_LTLIBRARIES = libgsticydemux.la libgsticydemux_la_SOURCES = gsticydemux.c -libgsticydemux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgsticydemux_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ $(ZLIB_LIBS) +libgsticydemux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) +libgsticydemux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) $(ZLIB_LIBS) libgsticydemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgsticydemux_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/interleave/Makefile.am b/gst/interleave/Makefile.am index 8b1df9f58..d1d0b8227 100644 --- a/gst/interleave/Makefile.am +++ b/gst/interleave/Makefile.am @@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstinterleave.la libgstinterleave_la_SOURCES = plugin.c interleave.c deinterleave.c -libgstinterleave_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -libgstinterleave_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_LIBS) $(GST_BASE_LIBS) +libgstinterleave_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) +libgstinterleave_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_LIBS) libgstinterleave_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstinterleave_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/matroska/Makefile.am b/gst/matroska/Makefile.am index f9a689433..b1e43e213 100644 --- a/gst/matroska/Makefile.am +++ b/gst/matroska/Makefile.am @@ -21,8 +21,7 @@ noinst_HEADERS = \ libgstmatroska_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ - $(GST_CFLAGS) \ - -I$(top_srcdir)/gst-libs + $(GST_CFLAGS) libgstmatroska_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ -lgstriff-@GST_MAJORMINOR@ \ diff --git a/gst/qtdemux/Makefile.am b/gst/qtdemux/Makefile.am index 354667de7..4d32fc722 100644 --- a/gst/qtdemux/Makefile.am +++ b/gst/qtdemux/Makefile.am @@ -1,14 +1,14 @@ plugin_LTLIBRARIES = libgstqtdemux.la -libgstqtdemux_la_CFLAGS = ${GST_CFLAGS} $(GST_PLUGINS_BASE_CFLAGS) +libgstqtdemux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstqtdemux_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ -lgstriff-@GST_MAJORMINOR@ \ -lgstaudio-@GST_MAJORMINOR@ \ -lgstrtp-@GST_MAJORMINOR@ \ -lgsttag-@GST_MAJORMINOR@ \ - $(GST_BASE_LIBS) $(ZLIB_LIBS) + $(GST_BASE_LIBS) $(GST_LIBS) $(ZLIB_LIBS) libgstqtdemux_la_LDFLAGS = ${GST_PLUGIN_LDFLAGS} libgstqtdemux_la_SOURCES = quicktime.c gstrtpxqtdepay.c qtdemux.c qtdemux_types.c qtdemux_dump.c libgstqtdemux_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/replaygain/Makefile.am b/gst/replaygain/Makefile.am index 64c07b995..19e45fbcb 100644 --- a/gst/replaygain/Makefile.am +++ b/gst/replaygain/Makefile.am @@ -7,9 +7,10 @@ libgstreplaygain_la_SOURCES = \ replaygain.c \ rganalysis.c libgstreplaygain_la_CFLAGS = \ - $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) + $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstreplaygain_la_LIBADD = \ - $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-0.10 $(LIBM) + $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-0.10 \ + $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) libgstreplaygain_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstreplaygain_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am index 51796715a..9292d4fba 100644 --- a/gst/rtp/Makefile.am +++ b/gst/rtp/Makefile.am @@ -74,12 +74,13 @@ else WINSOCK2_LIBS = endif -libgstrtp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \ +libgstrtp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) +libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ -lgstaudio-@GST_MAJORMINOR@ \ -lgsttag-@GST_MAJORMINOR@ \ - -lgstrtp-@GST_MAJORMINOR@ $(WINSOCK2_LIBS) \ - $(LIBM) + -lgstrtp-@GST_MAJORMINOR@ \ + $(GST_BASE_LIBS) $(GST_LIBS) \ + $(WINSOCK2_LIBS) $(LIBM) libgstrtp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstrtp_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/udp/Makefile.am b/gst/udp/Makefile.am index d143e436a..5b521eeb7 100644 --- a/gst/udp/Makefile.am +++ b/gst/udp/Makefile.am @@ -17,9 +17,9 @@ libgstudp_la_SOURCES = gstudp.c gstudpsrc.c gstudpsink.c gstmultiudpsink.c gstdy # adding -D_GNU_SOURCE to get non-POSIX extensions like EAI_ADDRFAMILY # with glibc >= 2.8 when including netdb.h (see glibc sources bug 6452) -libgstudp_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -D_GNU_SOURCE -libgstudp_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(WIN32_LIBS)\ - -lgstnetbuffer-@GST_MAJORMINOR@ +libgstudp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) -D_GNU_SOURCE +libgstudp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstnetbuffer-@GST_MAJORMINOR@ \ + $(GST_BASE_LIBS) $(WIN32_LIBS) libgstudp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstudp_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/videomixer/Makefile.am b/gst/videomixer/Makefile.am index bef2941ee..c6d7cb127 100644 --- a/gst/videomixer/Makefile.am +++ b/gst/videomixer/Makefile.am @@ -1,8 +1,10 @@ plugin_LTLIBRARIES = libgstvideomixer.la libgstvideomixer_la_SOURCES = videomixer.c blend.c -libgstvideomixer_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(LIBOIL_CFLAGS) -libgstvideomixer_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(LIBOIL_LIBS) +libgstvideomixer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS) +libgstvideomixer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \ + $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(LIBOIL_LIBS) libgstvideomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvideomixer_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/wavparse/Makefile.am b/gst/wavparse/Makefile.am index 73e36e424..cd3e48721 100644 --- a/gst/wavparse/Makefile.am +++ b/gst/wavparse/Makefile.am @@ -2,16 +2,16 @@ plugin_LTLIBRARIES = libgstwavparse.la libgstwavparse_la_SOURCES = gstwavparse.c libgstwavparse_la_CFLAGS = \ - $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ - $(GST_CFLAGS) \ - -I$(top_srcdir)/gst-libs + $(GST_BASE_CFLAGS) \ + $(GST_CFLAGS) libgstwavparse_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) \ -lgstriff-@GST_MAJORMINOR@ \ -lgstaudio-@GST_MAJORMINOR@ \ -lgsttag-@GST_MAJORMINOR@ \ - $(GST_PLUGINS_BASE_LIBS) \ $(GST_BASE_LIBS) \ + $(GST_LIBS) \ $(LIBM) libgstwavparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstwavparse_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/sys/directsound/Makefile.am b/sys/directsound/Makefile.am index ab58a9258..822790523 100644 --- a/sys/directsound/Makefile.am +++ b/sys/directsound/Makefile.am @@ -1,12 +1,18 @@ plugin_LTLIBRARIES = libgstdirectsoundsink.la libgstdirectsoundsink_la_SOURCES = gstdirectsoundsink.c gstdirectsoundplugin.c -libgstdirectsoundsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTSOUND_CFLAGS) -libgstdirectsoundsink_la_LIBADD = $(DIRECTSOUND_LIBS) \ - $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) +libgstdirectsoundsink_la_CFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_CFLAGS) \ + $(DIRECTSOUND_CFLAGS) +libgstdirectsoundsink_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) \ + -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \ + $(GST_BASE_LIBS) \ + $(GST_LIBS) \ + $(DIRECTSOUND_LIBS) libgstdirectsoundsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS) libgstdirectsoundsink_la_LIBTOOLFLAGS = --tag=disable-static -noinst_HEADERS = gstdirectsoundsink.h +noinst_HEADERS = gstdirectsoundsink.h diff --git a/sys/oss/Makefile.am b/sys/oss/Makefile.am index c6cb212f6..c42dfeaa7 100644 --- a/sys/oss/Makefile.am +++ b/sys/oss/Makefile.am @@ -8,11 +8,12 @@ libgstossaudio_la_SOURCES = gstossaudio.c \ gstosssink.c \ gstosssrc.c -libgstossaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstossaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstossaudio_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ -lgstinterfaces-$(GST_MAJORMINOR) \ -lgstaudio-$(GST_MAJORMINOR) \ + $(GST_BASE_LIBS) \ $(GST_LIBS) libgstossaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstossaudio_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/sys/waveform/Makefile.am b/sys/waveform/Makefile.am index c8c084c89..a9562a818 100644 --- a/sys/waveform/Makefile.am +++ b/sys/waveform/Makefile.am @@ -7,9 +7,12 @@ plugin_LTLIBRARIES = libgstwaveformsink.la libgstwaveformsink_la_SOURCES = gstwaveformsink.c gstwaveformplugin.c libgstwaveformsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTSOUND_CFLAGS) -libgstwaveformsink_la_LIBADD = $(DIRECTSOUND_LIBS) \ - $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) +libgstwaveformsink_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) \ + -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \ + $(GST_BASE_LIBS) \ + $(GST_LIBS) \ + $(DIRECTSOUND_LIBS) libgstwaveformsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS) libgstwaveformsink_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/tests/examples/v4l2/Makefile.am b/tests/examples/v4l2/Makefile.am index 43d3da2ac..78e4da12e 100644 --- a/tests/examples/v4l2/Makefile.am +++ b/tests/examples/v4l2/Makefile.am @@ -1,6 +1,6 @@ noinst_PROGRAMS = probe probe_SOURCES = probe.c -probe_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -probe_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-0.10 +probe_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) +probe_LDFLAGS = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-0.10 $(GST_BASE_LIBS) $(GST_LIBS) -- 2.34.1