diff options
author | David I. Lehn <dlehn@users.sourceforge.net> | 2002-01-12 03:34:26 +0000 |
---|---|---|
committer | David I. Lehn <dlehn@users.sourceforge.net> | 2002-01-12 03:34:26 +0000 |
commit | c656b5eab642b3fa90fd738bd1fe83d9d001128e (patch) | |
tree | aa98fd7213568e9a831c9eb410a8ae024c086f55 | |
parent | 2a1103ef057f577f97383f9fcb5939d992fd06a7 (diff) |
s/filter/plugin/ link plugins to GST_LIBS rearrange rules to a common format
Original commit message from CVS:
* s/filter/plugin/
* link plugins to GST_LIBS
* rearrange rules to a common format
-rw-r--r-- | ext/aalib/Makefile.am | 5 | ||||
-rw-r--r-- | ext/dv/Makefile.am | 2 | ||||
-rw-r--r-- | ext/esd/Makefile.am | 11 | ||||
-rw-r--r-- | ext/flac/Makefile.am | 5 | ||||
-rw-r--r-- | ext/jpeg/Makefile.am | 2 | ||||
-rw-r--r-- | ext/ladspa/Makefile.am | 1 | ||||
-rw-r--r-- | ext/mikmod/Makefile.am | 5 | ||||
-rw-r--r-- | ext/raw1394/Makefile.am | 3 | ||||
-rw-r--r-- | gst/auparse/Makefile.am | 7 | ||||
-rw-r--r-- | gst/avi/Makefile.am | 9 | ||||
-rw-r--r-- | gst/cutter/Makefile.am | 5 | ||||
-rw-r--r-- | gst/flx/Makefile.am | 5 | ||||
-rw-r--r-- | gst/law/Makefile.am | 6 | ||||
-rw-r--r-- | gst/level/Makefile.am | 5 | ||||
-rw-r--r-- | gst/median/Makefile.am | 5 | ||||
-rw-r--r-- | gst/smoothwave/Makefile.am | 6 | ||||
-rw-r--r-- | gst/spectrum/Makefile.am | 5 | ||||
-rw-r--r-- | gst/udp/Makefile.am | 5 | ||||
-rw-r--r-- | gst/wavparse/Makefile.am | 5 | ||||
-rw-r--r-- | sys/oss/Makefile.am | 5 |
20 files changed, 57 insertions, 45 deletions
diff --git a/ext/aalib/Makefile.am b/ext/aalib/Makefile.am index 984b2f31..0b20ad89 100644 --- a/ext/aalib/Makefile.am +++ b/ext/aalib/Makefile.am @@ -2,11 +2,8 @@ plugindir = $(libdir)/gst plugin_LTLIBRARIES = libgstaasink.la - libgstaasink_la_SOURCES = gstaasink.c -libgstaasink_la_LIBADD = $(AALIB_LIBS) libgstaasink_la_CFLAGS = $(GST_CFLAGS) $(AALIB_CFLAGS) +libgstaasink_la_LIBADD = $(GST_LIBS) $(AALIB_LIBS) noinst_HEADERS = gstaasink.h - - diff --git a/ext/dv/Makefile.am b/ext/dv/Makefile.am index 9801ac0f..23420acb 100644 --- a/ext/dv/Makefile.am +++ b/ext/dv/Makefile.am @@ -3,8 +3,8 @@ plugindir = $(libdir)/gst plugin_LTLIBRARIES = libgstdvdec.la libgstdvdec_la_SOURCES = gstdvdec.c -libgstdvdec_la_LIBADD = $(DV_LIBS) libgstdvdec_la_CFLAGS = $(GST_CFLAGS) +libgstdvdec_la_LIBADD = $(GST_LIBS) $(DV_LIBS) noinst_HEADERS = gstdvdec.h diff --git a/ext/esd/Makefile.am b/ext/esd/Makefile.am index 0e3e92fb..6cd5845a 100644 --- a/ext/esd/Makefile.am +++ b/ext/esd/Makefile.am @@ -1,11 +1,10 @@ -filterdir = $(libdir)/gst +plugindir = $(libdir)/gst -filter_LTLIBRARIES = libesdsink.la +plugin_LTLIBRARIES = libesdsink.la libesdsink_la_SOURCES = esdsink.c -noinst_HEADERS = esdsink.h - -libesdsink_la_CFLAGS = $(ESD_CFLAGS) $(GST_CFLAGS) -libesdsink_la_LIBADD = $(ESD_LIBS) +libesdsink_la_CFLAGS = $(GST_CFLAGS) $(ESD_CFLAGS) +libesdsink_la_LIBADD = $(GST_LIBS) $(ESD_LIBS) +noinst_HEADERS = esdsink.h EXTRA_DIST = README diff --git a/ext/flac/Makefile.am b/ext/flac/Makefile.am index 6efc3538..fb4db406 100644 --- a/ext/flac/Makefile.am +++ b/ext/flac/Makefile.am @@ -3,8 +3,7 @@ plugindir = $(libdir)/gst plugin_LTLIBRARIES = libgstflac.la libgstflac_la_SOURCES = gstflac.c gstflacenc.c gstflacdec.c - -noinst_HEADERS = gstflacenc.h gstflacdec.h - libgstflac_la_CFLAGS = $(GST_CFLAGS) libgstflac_la_LIBADD = $(GST_LIBS) $(FLAC_LIBS) + +noinst_HEADERS = gstflacenc.h gstflacdec.h diff --git a/ext/jpeg/Makefile.am b/ext/jpeg/Makefile.am index 8f467686..795a48c4 100644 --- a/ext/jpeg/Makefile.am +++ b/ext/jpeg/Makefile.am @@ -3,9 +3,9 @@ plugindir = $(libdir)/gst plugin_LTLIBRARIES = libgstjpeg.la libgstjpeg_la_SOURCES = gstjpeg.c gstjpegdec.c gstjpegenc.c -libgstjpeg_la_LIBADD = $(JPEG_LIBS) libgstjpeg_la_CFLAGS = $(GST_CFLAGS) ## FIXME: check these CFLAGS ## -O3 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math -DNDEBUG +libgstjpeg_la_LIBADD = $(GST_LIBS) $(JPEG_LIBS) noinst_HEADERS = gstjpegdec.h gstjpegenc.h diff --git a/ext/ladspa/Makefile.am b/ext/ladspa/Makefile.am index 5a7dcd10..9f986a48 100644 --- a/ext/ladspa/Makefile.am +++ b/ext/ladspa/Makefile.am @@ -4,5 +4,6 @@ plugin_LTLIBRARIES = libgstladspa.la libgstladspa_la_SOURCES = gstladspa.c search.c load.c libgstladspa_la_CFLAGS = $(GST_CFLAGS) +libgstladspa_la_LIBADD = $(GST_LIBS) noinst_HEADERS = gstladspa.h ladspa.h utils.h diff --git a/ext/mikmod/Makefile.am b/ext/mikmod/Makefile.am index 0219925f..b7f1985e 100644 --- a/ext/mikmod/Makefile.am +++ b/ext/mikmod/Makefile.am @@ -3,9 +3,8 @@ plugindir = $(libdir)/gst plugin_LTLIBRARIES = libgstmikmod.la libgstmikmod_la_SOURCES = gstmikmod.c drv_gst.c mikmod_reader.c mikmod_types.c - -libgstmikmod_la_LIBADD = $(MIKMOD_LIBS) -libgstmikmod_la_CFLAGS = $(MIKMOD_CFLAGS) $(GST_CFLAGS) +libgstmikmod_la_CFLAGS = $(GST_CFLAGS) $(MIKMOD_CFLAGS) +libgstmikmod_la_LIBADD = $(GST_LIBS) $(MIKMOD_LIBS) noinst_HEADERS = gstmikmod.h diff --git a/ext/raw1394/Makefile.am b/ext/raw1394/Makefile.am index af17049b..a16f7c4d 100644 --- a/ext/raw1394/Makefile.am +++ b/ext/raw1394/Makefile.am @@ -3,6 +3,7 @@ plugindir = $(libdir)/gst plugin_LTLIBRARIES = libgst1394.la libgst1394_la_SOURCES = gst1394.c gstdv1394src.c -libgst1394_la_LIBADD = $(raw1394_LIBS) +libgst1394_la_CFLAGS = $(GST_CFLAGS) +libgst1394_la_LIBADD = $(GST_LIBS) $(raw1394_LIBS) noinst_HEADERS = gstdv1394src.h diff --git a/gst/auparse/Makefile.am b/gst/auparse/Makefile.am index 0a7ff222..5b4c691e 100644 --- a/gst/auparse/Makefile.am +++ b/gst/auparse/Makefile.am @@ -1,8 +1,9 @@ -filterdir = $(libdir)/gst +plugindir = $(libdir)/gst -filter_LTLIBRARIES = libgstparseau.la +plugin_LTLIBRARIES = libgstparseau.la libgstparseau_la_SOURCES = gstparseau.c -libgstparseau_la_CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) +libgstparseau_la_CFLAGS = $(GST_CFLAGS) +libgstparseau_la_LIBADD = $(GST_LIBS) noinst_HEADERS = gstparseau.h diff --git a/gst/avi/Makefile.am b/gst/avi/Makefile.am index e37d851b..7fecc298 100644 --- a/gst/avi/Makefile.am +++ b/gst/avi/Makefile.am @@ -1,6 +1,6 @@ -filterdir = $(libdir)/gst +plugindir = $(libdir)/gst -filter_LTLIBRARIES = libgstavimux.la libgstavidecoder.la libgstavidemux.la libgstavitypes.la libgstaviaudiodecoder.la +plugin_LTLIBRARIES = libgstavimux.la libgstavidecoder.la libgstavidemux.la libgstavitypes.la libgstaviaudiodecoder.la libgstavidemux_la_SOURCES = gstavidemux.c libgstavitypes_la_SOURCES = gstavitypes.c @@ -12,9 +12,14 @@ noinst_HEADERS = gstavidecoder.h gstavimux.h gstavitypes.h gstavidemux.h gstavia #CFLAGS += -Wall -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -DNDEBUG libgstavidecoder_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS) +libgstavidecoder_la_LIBADD = $(GST_LIBS) libgstavidemux_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS) +libgstavidemux_la_LIBADD = $(GST_LIBS) libgstavitypes_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS) +libgstavitypes_la_LIBADD = $(GST_LIBS) libgstavimux_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS) +libgstavimux_la_LIBADD = $(GST_LIBS) libgstaviaudiodecoder_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS) +libgstaviaudiodecoder_la_LIBADD = $(GST_LIBS) EXTRA_DIST = README_win32dll README diff --git a/gst/cutter/Makefile.am b/gst/cutter/Makefile.am index 68c6c2eb..548bcbf8 100644 --- a/gst/cutter/Makefile.am +++ b/gst/cutter/Makefile.am @@ -1,9 +1,10 @@ -filterdir = $(libdir)/gst +plugindir = $(libdir)/gst -filter_LTLIBRARIES = libgstcutter.la +plugin_LTLIBRARIES = libgstcutter.la libgstcutter_la_SOURCES = gstcutter.c libgstcutter_la_CFLAGS = $(GST_CFLAGS) +libgstcutter_la_LIBADD = $(GST_LIBS) noinst_HEADERS = gstcutter.h filter.func diff --git a/gst/flx/Makefile.am b/gst/flx/Makefile.am index 79a6fba7..df0a6880 100644 --- a/gst/flx/Makefile.am +++ b/gst/flx/Makefile.am @@ -1,9 +1,10 @@ -filterdir = $(libdir)/gst +plugindir = $(libdir)/gst -filter_LTLIBRARIES = libgstflxdec.la +plugin_LTLIBRARIES = libgstflxdec.la libgstflxdec_la_SOURCES = gstflxdec.c flx_color.c libgstflxdec_la_CFLAGS = $(GST_CFLAGS) +libgstflxdec_la_LIBADD = $(GST_LIBS) noinst_HEADERS = flx_fmt.h flx_color.h gstflxdec.h diff --git a/gst/law/Makefile.am b/gst/law/Makefile.am index c32b56eb..16983491 100644 --- a/gst/law/Makefile.am +++ b/gst/law/Makefile.am @@ -1,11 +1,13 @@ -filterdir = $(libdir)/gst +plugindir = $(libdir)/gst -filter_LTLIBRARIES = libgstalaw.la libgstmulaw.la +plugin_LTLIBRARIES = libgstalaw.la libgstmulaw.la libgstalaw_la_SOURCES = alaw-encode.c mulaw-conversion.c alaw-conversion.c alaw-decode.c alaw.c libgstalaw_la_CFLAGS = $(GST_CFLAGS) +libgstalaw_la_LIBADD = $(GST_LIBS) libgstmulaw_la_SOURCES = mulaw-encode.c mulaw-conversion.c mulaw-decode.c mulaw.c libgstmulaw_la_CFLAGS = $(GST_CFLAGS) +libgstmulaw_la_LIBADD = $(GST_LIBS) noinst_HEADERS = mulaw-conversion.h alaw-encode.h alaw-decode.h alaw-conversion.h mulaw-encode.h mulaw-decode.h diff --git a/gst/level/Makefile.am b/gst/level/Makefile.am index df87d6c4..c876a810 100644 --- a/gst/level/Makefile.am +++ b/gst/level/Makefile.am @@ -1,9 +1,10 @@ -filterdir = $(libdir)/gst +plugindir = $(libdir)/gst -filter_LTLIBRARIES = libgstlevel.la +plugin_LTLIBRARIES = libgstlevel.la libgstlevel_la_SOURCES = gstlevel.c libgstlevel_la_CFLAGS = $(GST_CFLAGS) +libgstlevel_la_LIBADD = $(GST_LIBS) noinst_HEADERS = gstlevel.h filter.func diff --git a/gst/median/Makefile.am b/gst/median/Makefile.am index cf75f34f..dae296f1 100644 --- a/gst/median/Makefile.am +++ b/gst/median/Makefile.am @@ -1,9 +1,10 @@ -filterdir = $(libdir)/gst +plugindir = $(libdir)/gst -filter_LTLIBRARIES = libgstmedian.la +plugin_LTLIBRARIES = libgstmedian.la libgstmedian_la_SOURCES = gstmedian.c libgstmedian_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math $(GST_CFLAGS) +libgstmedian_la_LIBADD = $(GST_LIBS) noinst_HEADERS = gstmedian.h diff --git a/gst/smoothwave/Makefile.am b/gst/smoothwave/Makefile.am index e46a9572..d74c4a30 100644 --- a/gst/smoothwave/Makefile.am +++ b/gst/smoothwave/Makefile.am @@ -1,10 +1,10 @@ -filterdir = $(libdir)/gst +plugindir = $(libdir)/gst -filter_LTLIBRARIES = libgstsmoothwave.la +plugin_LTLIBRARIES = libgstsmoothwave.la libgstsmoothwave_la_SOURCES = gstsmoothwave.c libgstsmoothwave_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -libgstsmoothwave_la_LIBADD = $(GTK_LIBS) +libgstsmoothwave_la_LIBADD = $(GST_LIBS) $(GTK_LIBS) noinst_HEADERS = gstsmoothwave.h diff --git a/gst/spectrum/Makefile.am b/gst/spectrum/Makefile.am index 65fefde4..370478da 100644 --- a/gst/spectrum/Makefile.am +++ b/gst/spectrum/Makefile.am @@ -1,9 +1,10 @@ -filterdir = $(libdir)/gst +plugindir = $(libdir)/gst -filter_LTLIBRARIES = libgstspectrum.la +plugin_LTLIBRARIES = libgstspectrum.la libgstspectrum_la_SOURCES = gstspectrum.c fix_fft.c libgstspectrum_la_CFLAGS = $(GST_CFLAGS) +libgstspectrum_la_LIBADD = $(GST_LIBS) noinst_HEADERS = gstspectrum.h diff --git a/gst/udp/Makefile.am b/gst/udp/Makefile.am index 0cd25aac..0c66cda2 100644 --- a/gst/udp/Makefile.am +++ b/gst/udp/Makefile.am @@ -1,9 +1,10 @@ -filterdir = $(libdir)/gst +plugindir = $(libdir)/gst -filter_LTLIBRARIES = libgstudp.la +plugin_LTLIBRARIES = libgstudp.la libgstudp_la_SOURCES = gstudp.c gstudpsrc.c gstudpsink.c libgstudp_la_CFLAGS = $(GST_CFLAGS) +libgstudp_la_LIBADD = $(GST_LIBS) noinst_HEADERS = gstudpsink.h gstudpsrc.h diff --git a/gst/wavparse/Makefile.am b/gst/wavparse/Makefile.am index d9c8e4df..2d307fc1 100644 --- a/gst/wavparse/Makefile.am +++ b/gst/wavparse/Makefile.am @@ -1,8 +1,9 @@ -filterdir = $(libdir)/gst +plugindir = $(libdir)/gst -filter_LTLIBRARIES = libgstwavparse.la +plugin_LTLIBRARIES = libgstwavparse.la libgstwavparse_la_SOURCES = gstwavparse.c gstriff.c libgstwavparse_la_CFLAGS = $(GST_CFLAGS) +libgstwavparse_la_LIBADD = $(GST_LIBS) noinst_HEADERS = gstwavparse.h gstriff.h diff --git a/sys/oss/Makefile.am b/sys/oss/Makefile.am index c6c84fd6..4c836379 100644 --- a/sys/oss/Makefile.am +++ b/sys/oss/Makefile.am @@ -1,9 +1,10 @@ -filterdir = $(libdir)/gst +plugindir = $(libdir)/gst -filter_LTLIBRARIES = libgstossaudio.la libgstosshelper.la +plugin_LTLIBRARIES = libgstossaudio.la libgstosshelper.la libgstossaudio_la_SOURCES = gstosssink.c gstosssrc.c gstossaudio.c gstossgst.c libgstossaudio_la_CFLAGS = $(GST_CFLAGS) +libgstossaudio_la_LIBADD = $(GST_LIBS) libgstosshelper_la_SOURCES = gstosshelper.c |