From 1ee4a020437fa0dff0264768d80f425f87d986b1 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Tue, 19 Mar 2002 01:39:43 +0000 Subject: [PATCH] s/@GST_PLUGIN_LDFLAGS@/$(GST_PLUGIN_LDFLAGS)/ @-substitued variables variables are defined as make variables automagi... Original commit message from CVS: s/@GST_PLUGIN_LDFLAGS@/$(GST_PLUGIN_LDFLAGS)/ @-substitued variables variables are defined as make variables automagically, and this gives the user the freedom to say make GST_PLUGIN_LDFLAGS=-myflag --- ext/alsa/Makefile.am | 2 +- ext/cdparanoia/Makefile.am | 2 +- ext/gnomevfs/Makefile.am | 4 ++-- ext/vorbis/Makefile.am | 2 +- gst-libs/gst/audio/Makefile.am | 2 +- gst-libs/gst/idct/Makefile.am | 2 +- gst-libs/gst/resample/Makefile.am | 2 +- gst-libs/gst/riff/Makefile.am | 2 +- gst/adder/Makefile.am | 2 +- gst/audioscale/Makefile.am | 2 +- gst/sine/Makefile.am | 2 +- gst/videoscale/Makefile.am | 2 +- gst/volume/Makefile.am | 2 +- sys/v4l/Makefile.am | 8 ++++---- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ext/alsa/Makefile.am b/ext/alsa/Makefile.am index 5c31e40b85..53d6395b2c 100644 --- a/ext/alsa/Makefile.am +++ b/ext/alsa/Makefile.am @@ -5,7 +5,7 @@ plugin_LTLIBRARIES = libgstalsa.la libgstalsa_la_SOURCES = gstalsa.c libgstalsa_la_CFLAGS = $(GST_CFLAGS) $(ALSA_CFLAGS) libgstalsa_la_LIBADD = $(GST_LIBS) $(ALSA_LIBS) -libgstalsa_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstalsa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstalsa.h diff --git a/ext/cdparanoia/Makefile.am b/ext/cdparanoia/Makefile.am index af63e005eb..238d09c1d9 100644 --- a/ext/cdparanoia/Makefile.am +++ b/ext/cdparanoia/Makefile.am @@ -5,6 +5,6 @@ plugin_LTLIBRARIES = libgstcdparanoia.la libgstcdparanoia_la_SOURCES = gstcdparanoia.c libgstcdparanoia_la_CFLAGS = $(GST_CFLAGS) libgstcdparanoia_la_LIBADD = $(GST_LIBS) $(CDPARANOIA_LIBS) -libgstcdparanoia_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstcdparanoia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstcdparanoia.h diff --git a/ext/gnomevfs/Makefile.am b/ext/gnomevfs/Makefile.am index 36d609aac9..443a561dbf 100644 --- a/ext/gnomevfs/Makefile.am +++ b/ext/gnomevfs/Makefile.am @@ -5,9 +5,9 @@ plugin_LTLIBRARIES = libgstgnomevfssrc.la libgstgnomevfssink.la libgstgnomevfssrc_la_SOURCES = gstgnomevfssrc.c libgstgnomevfssrc_la_CFLAGS = $(GST_CFLAGS) $(GNOME_VFS_CFLAGS) libgstgnomevfssrc_la_LIBADD = $(GST_LIBS) $(GNOME_VFS_LIBS) -libgstgnomevfssrc_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstgnomevfssrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstgnomevfssink_la_SOURCES = gstgnomevfssink.c libgstgnomevfssink_la_CFLAGS = $(GST_CFLAGS) $(GNOME_VFS_CFLAGS) libgstgnomevfssink_la_LIBADD = $(GST_LIBS) $(GNOME_VFS_LIBS) -libgstgnomevfssink_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstgnomevfssink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/ext/vorbis/Makefile.am b/ext/vorbis/Makefile.am index ec63b5b0fc..3434b19cb2 100644 --- a/ext/vorbis/Makefile.am +++ b/ext/vorbis/Makefile.am @@ -6,6 +6,6 @@ libgstvorbis_la_SOURCES = vorbis.c vorbisenc.c vorbisdec.c libgstvorbis_la_CFLAGS = $(GST_CFLAGS) $(VORBIS_CFLAGS) ## AM_PATH_VORBIS also sets VORBISENC_LIBS libgstvorbis_la_LIBADD = $(GST_LIBS) $(VORBIS_LIBS) $(VORBISENC_LIBS) -libgstvorbis_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstvorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = vorbisenc.h vorbisdec.h diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index a0faee43a5..082ace35c7 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -9,4 +9,4 @@ libgstaudioinclude_HEADERS = audio.h libgstaudio_la_LIBADD = $(GST_LIBS) libgstaudio_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math -libgstaudio_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/idct/Makefile.am b/gst-libs/gst/idct/Makefile.am index 68e780204b..8fea312184 100644 --- a/gst-libs/gst/idct/Makefile.am +++ b/gst-libs/gst/idct/Makefile.am @@ -29,4 +29,4 @@ noinst_HEADERS = dct.h libgstidct_la_LIBADD = $(GST_LIBS) libgstidct_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math -libgstidct_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstidct_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/resample/Makefile.am b/gst-libs/gst/resample/Makefile.am index 439310c0c1..c1def79d12 100644 --- a/gst-libs/gst/resample/Makefile.am +++ b/gst-libs/gst/resample/Makefile.am @@ -15,7 +15,7 @@ endif libgstresample_la_SOURCES = dtos.c functable.c resample.c resample.h libgstresample_la_LIBADD = $(GST_LIBS) libgstresample_la_CFLAGS = $(GST_CFLAGS) -ffast-math $(ARCHCFLAGS) -libgstresample_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = resample.h diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am index d05534942c..c0931c8a15 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am @@ -9,4 +9,4 @@ libgstriffinclude_HEADERS = riff.h libgstriff_la_LIBADD = $(GST_LIBS) libgstriff_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math -libgstriff_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstriff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/adder/Makefile.am b/gst/adder/Makefile.am index 17d80e196c..15d6f5f4b8 100644 --- a/gst/adder/Makefile.am +++ b/gst/adder/Makefile.am @@ -5,6 +5,6 @@ plugin_LTLIBRARIES = libgstadder.la libgstadder_la_SOURCES = gstadder.c libgstadder_la_CFLAGS = $(GST_CFLAGS) libgstadder_la_LIBADD = $(GST_LIBS) -libgstadder_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstadder.h diff --git a/gst/audioscale/Makefile.am b/gst/audioscale/Makefile.am index 0d834ac553..e1e95ad8d5 100644 --- a/gst/audioscale/Makefile.am +++ b/gst/audioscale/Makefile.am @@ -5,6 +5,6 @@ plugin_LTLIBRARIES = libgstaudioscale.la libgstaudioscale_la_SOURCES = gstaudioscale.c libgstaudioscale_la_CFLAGS = -ffast-math $(GST_CFLAGS) libgstaudioscale_la_LIBADD = $(GST_LIBS) -libgstaudioscale_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstaudioscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstaudioscale.h diff --git a/gst/sine/Makefile.am b/gst/sine/Makefile.am index 8f4b74ab45..08b45fc444 100644 --- a/gst/sine/Makefile.am +++ b/gst/sine/Makefile.am @@ -5,7 +5,7 @@ plugin_LTLIBRARIES = libgstsinesrc.la libgstsinesrc_la_SOURCES = gstsinesrc.c libgstsinesrc_la_CFLAGS = $(GST_CFLAGS) libgstsinesrc_la_LIBADD = $(GST_LIBS) -libgstsinesrc_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstsinesrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstsinesrc.h diff --git a/gst/videoscale/Makefile.am b/gst/videoscale/Makefile.am index 2205586590..6c079b4a75 100644 --- a/gst/videoscale/Makefile.am +++ b/gst/videoscale/Makefile.am @@ -16,6 +16,6 @@ libgstvideoscale_la_SOURCES = \ $(ARCHSRCS) libgstvideoscale_la_CFLAGS = -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math $(GST_CFLAGS) libgstvideoscale_la_LIBADD = $(GST_LIBS) -libgstvideoscale_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstvideoscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstvideoscale.h videoscale_x86.h diff --git a/gst/volume/Makefile.am b/gst/volume/Makefile.am index fa3de21e71..982aca50a5 100644 --- a/gst/volume/Makefile.am +++ b/gst/volume/Makefile.am @@ -5,6 +5,6 @@ plugin_LTLIBRARIES = libgstvolume.la libgstvolume_la_SOURCES = gstvolume.c libgstvolume_la_CFLAGS = $(GST_CFLAGS) libgstvolume_la_LIBADD = $(GST_LIBS) -libgstvolume_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstvolume_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstvolume.h filter.func diff --git a/sys/v4l/Makefile.am b/sys/v4l/Makefile.am index b3ae2c8d3a..16a2391246 100644 --- a/sys/v4l/Makefile.am +++ b/sys/v4l/Makefile.am @@ -6,22 +6,22 @@ plugin_LTLIBRARIES = libgstv4lelement.la libgstv4lsrc.la \ libgstv4lelement_la_SOURCES = gstv4lelement.c v4l_calls.c v4l-overlay_calls.c libgstv4lelement_la_CFLAGS = $(GST_CFLAGS) libgstv4lelement_la_LIBADD = $(GST_LIBS) -libgstv4lelement_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstv4lelement_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstv4lsrc_la_SOURCES = gstv4lsrc.c v4lsrc_calls.c libgstv4lsrc_la_CFLAGS = $(GST_CFLAGS) libgstv4lsrc_la_LIBADD = $(GST_LIBS) libgstv4lelement.la -libgstv4lsrc_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstv4lsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstv4lmjpegsrc_la_SOURCES = gstv4lmjpegsrc.c v4lmjpegsrc_calls.c libgstv4lmjpegsrc_la_CFLAGS = $(GST_CFLAGS) libgstv4lmjpegsrc_la_LIBADD = $(GST_LIBS) libgstv4lelement.la -libgstv4lmjpegsrc_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstv4lmjpegsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstv4lmjpegsink_la_SOURCES = gstv4lmjpegsink.c v4lmjpegsink_calls.c libgstv4lmjpegsink_la_CFLAGS = $(GST_CFLAGS) libgstv4lmjpegsink_la_LIBADD = $(GST_LIBS) libgstv4lelement.la -libgstv4lmjpegsink_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@ +libgstv4lmjpegsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstv4lelement.h v4l_calls.h \ gstv4lsrc.h v4lsrc_calls.h \