diff options
author | Thomas Vander Stichele <thomas@apestaart.org> | 2006-06-11 13:57:19 +0000 |
---|---|---|
committer | Thomas Vander Stichele <thomas@apestaart.org> | 2006-06-11 13:57:19 +0000 |
commit | 5a027ffd66994bc4f7c9b5103af3ed0c60f7503b (patch) | |
tree | 84cb0f66b3b909125c7a5071091854fd19a6001f /ext | |
parent | b469e7235cbd4efb6086c19b276f8d09ed261207 (diff) |
autogen.sh: require am17
Original commit message from CVS:
* autogen.sh:
require am17
* configure.ac:
* ext/annodex/Makefile.am:
* ext/cdio/Makefile.am:
* ext/dv/Makefile.am:
* ext/esd/Makefile.am:
* ext/flac/Makefile.am:
* ext/gdk_pixbuf/Makefile.am:
* ext/ladspa/Makefile.am:
* ext/libcaca/Makefile.am:
* ext/speex/Makefile.am:
* ext/taglib/Makefile.am:
* sys/oss/Makefile.am:
* sys/sunaudio/Makefile.am:
* sys/ximage/Makefile.am:
clean up build further
Diffstat (limited to 'ext')
-rw-r--r-- | ext/annodex/Makefile.am | 9 | ||||
-rw-r--r-- | ext/cdio/Makefile.am | 8 | ||||
-rw-r--r-- | ext/dv/Makefile.am | 14 | ||||
-rw-r--r-- | ext/esd/Makefile.am | 5 | ||||
-rw-r--r-- | ext/flac/Makefile.am | 10 | ||||
-rw-r--r-- | ext/gdk_pixbuf/Makefile.am | 34 | ||||
-rw-r--r-- | ext/ladspa/Makefile.am | 2 | ||||
-rw-r--r-- | ext/libcaca/Makefile.am | 5 | ||||
-rw-r--r-- | ext/speex/Makefile.am | 14 | ||||
-rw-r--r-- | ext/taglib/Makefile.am | 6 |
10 files changed, 39 insertions, 68 deletions
diff --git a/ext/annodex/Makefile.am b/ext/annodex/Makefile.am index 8c47683d..816e809b 100644 --- a/ext/annodex/Makefile.am +++ b/ext/annodex/Makefile.am @@ -1,11 +1,5 @@ -# plugindir is set in configure - -# change libgstplugin.la to something more suitable plugin_LTLIBRARIES = libgstannodex.la -# for the next set of variables, rename the prefix if you renamed the .la - -# sources used to compile this plug-in libgstannodex_la_SOURCES = \ gstannodex.c \ gstcmmlutils.c \ @@ -14,14 +8,11 @@ libgstannodex_la_SOURCES = \ gstcmmltag.c \ gstcmmlparser.c -# flags used to compile this plugin -# we use the GST_LIBS flags because we might be using plug-in libs libgstannodex_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) $(XML_CFLAGS) libgstannodex_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \ $(GST_LIBS) $(XML_LIBS) libgstannodex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -# headers we need but don't want installed noinst_HEADERS = gstannodex.h gstcmmlutils.h gstcmmltag.h gstcmmlparser.h \ gstcmmldec.h gstcmmlenc.h diff --git a/ext/cdio/Makefile.am b/ext/cdio/Makefile.am index ba454d65..01092c71 100644 --- a/ext/cdio/Makefile.am +++ b/ext/cdio/Makefile.am @@ -1,4 +1,3 @@ - plugin_LTLIBRARIES = libgstcdio.la libgstcdio_la_SOURCES = \ @@ -7,12 +6,12 @@ libgstcdio_la_SOURCES = \ libgstcdio_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ - $(CDIO_CFLAGS) \ $(GST_BASE_CFLAGS) \ - $(GST_CFLAGS) + $(GST_CFLAGS) \ + $(CDIO_CFLAGS) libgstcdio_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstcdda-@GST_MAJORMINOR@ \ + $(GST_PLUGINS_BASE_LIBS) -lgstcdda-$(GST_MAJORMINOR) \ $(GST_BASE_LIBS) \ $(CDIO_LIBS) @@ -21,4 +20,3 @@ libgstcdio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = \ gstcdio.h \ gstcdiocddasrc.h - diff --git a/ext/dv/Makefile.am b/ext/dv/Makefile.am index 5afc7f06..d1f69ed3 100644 --- a/ext/dv/Makefile.am +++ b/ext/dv/Makefile.am @@ -1,18 +1,12 @@ plugin_LTLIBRARIES = libgstdv.la libgstdv_la_SOURCES = gstdv.c gstdvdec.c gstdvdemux.c -libgstdv_la_CFLAGS = $(GST_CFLAGS) $(LIBDV_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -libgstdv_la_LIBADD = $(GST_BASE_LIBS) $(LIBDV_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ +libgstdv_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBDV_CFLAGS) +libgstdv_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ + $(GST_BASE_LIBS) $(LIBDV_LIBS) libgstdv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstdvdemux.h gstdvdec.h -#if HAVE_GTK -#noinst_PROGRAMS = demo-play -#endif - -#demo_play_SOURCES = demo-play.c -#demo_play_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -#demo_play_LDFLAGS = $(GST_LIBS) $(GTK_LIBS) - EXTRA_DIST = NOTES diff --git a/ext/esd/Makefile.am b/ext/esd/Makefile.am index f47e2480..4c6aa4d9 100644 --- a/ext/esd/Makefile.am +++ b/ext/esd/Makefile.am @@ -1,9 +1,10 @@ plugin_LTLIBRARIES = libgstesd.la libgstesd_la_SOURCES = esdsink.c gstesd.c -#esdmon.c libgstesd_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ESD_CFLAGS) -libgstesd_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ $(ESD_LIBS) +libgstesd_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ + $(ESD_LIBS) libgstesd_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = esdsink.h esdmon.h diff --git a/ext/flac/Makefile.am b/ext/flac/Makefile.am index d789ddcb..4f9dcf99 100644 --- a/ext/flac/Makefile.am +++ b/ext/flac/Makefile.am @@ -1,12 +1,10 @@ plugin_LTLIBRARIES = libgstflac.la -# gstflactag.c -# gstflactag.h - libgstflac_la_SOURCES = gstflac.c gstflacdec.c gstflacenc.c -libgstflac_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir) $(GST_PLUGINS_BASE_CFLAGS) -libgstflac_la_LIBADD = $(GST_LIBS) $(FLAC_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - -lgsttag-@GST_MAJORMINOR@ +libgstflac_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstflac_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \ + $(GST_LIBS) $(FLAC_LIBS) libgstflac_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstflacenc.h gstflacdec.h diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am index 0f6a6c9a..316ca4e5 100644 --- a/ext/gdk_pixbuf/Makefile.am +++ b/ext/gdk_pixbuf/Makefile.am @@ -1,34 +1,14 @@ plugin_LTLIBRARIES = libgstgdkpixbuf.la libgstgdkpixbuf_la_SOURCES = gstgdkpixbuf.c pixbufscale.c -libgstgdkpixbuf_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) $(GST_BASE_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) -libgstgdkpixbuf_la_LIBADD = $(GTK_LIBS) $(GST_LIBS) $(GST_BASE_LIBS) +libgstgdkpixbuf_la_CFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_CFLAGS) $(GTK_CFLAGS) +libgstgdkpixbuf_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS) libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) - -#if -#loaderdir = $(DESTDIR)$(GDK_PIXBUF_LOADER_DIR) -#loader_LTLIBRARIES = gst_loader.la -# -#install-data-hook: -# if test -z "$(DESTDIR)" ; then \ -# $(mkinstalldirs) $(DESTDIR)$(GDK_PIXBUF_CONF_DIR) ; \ -# $(QUERYLOADERS) > $(DESTDIR)$(GDK_PIXBUF_CONF_DIR)/gdk-pixbuf.loaders ; \ -# fi -# -#gst_loader_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -DGDK_PIXBUF_ENABLE_BACKEND -#gst_loader_la_SOURCES = \ -# gstgdkanimation.c \ -# gst_loader.c -#gst_loader_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) --avoid-version --module -#gst_loader_la_LIBADD = $(GTK_LIBS) $(GST_LIBS) -#else -install-data-hook: - true -#endif - -noinst_HEADERS = gstgdkpixbuf.h \ +noinst_HEADERS = \ + gstgdkpixbuf.h \ pixbufscale.h \ gstgdkanimation.h - diff --git a/ext/ladspa/Makefile.am b/ext/ladspa/Makefile.am index 9ec52c11..e9730715 100644 --- a/ext/ladspa/Makefile.am +++ b/ext/ladspa/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstladspa.la libgstladspa_la_SOURCES = gstsignalprocessor.c gstladspa.c search.c load.c libgstladspa_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstladspa_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ +libgstladspa_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) libgstladspa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstsignalprocessor.h gstladspa.h utils.h diff --git a/ext/libcaca/Makefile.am b/ext/libcaca/Makefile.am index 0f3fdf38..4155803e 100644 --- a/ext/libcaca/Makefile.am +++ b/ext/libcaca/Makefile.am @@ -1,7 +1,10 @@ plugin_LTLIBRARIES = libgstcacasink.la libgstcacasink_la_SOURCES = gstcacasink.c -libgstcacasink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBCACA_CFLAGS) +libgstcacasink_la_CFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) \ + $(LIBCACA_CFLAGS) libgstcacasink_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ $(GST_BASE_LIBS) \ diff --git a/ext/speex/Makefile.am b/ext/speex/Makefile.am index b643e111..f90ed016 100644 --- a/ext/speex/Makefile.am +++ b/ext/speex/Makefile.am @@ -1,9 +1,15 @@ plugin_LTLIBRARIES = libgstspeex.la libgstspeex_la_SOURCES = gstspeex.c gstspeexdec.c gstspeexenc.c -libgstspeex_la_CFLAGS = $(GST_CFLAGS) $(SPEEX_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -libgstspeex_la_LIBADD = $(GST_LIBS) $(SPEEX_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - -lgsttag-@GST_MAJORMINOR@ -libgstspeex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) +libgstspeex_la_CFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) \ + $(SPEEX_CFLAGS) +libgstspeex_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \ + $(GST_BASE_LIBS) \ + $(GST_LIBS) \ + $(SPEEX_LIBS) +libgstspeex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstspeexenc.h gstspeexdec.h diff --git a/ext/taglib/Makefile.am b/ext/taglib/Makefile.am index 03774428..adeaae6f 100644 --- a/ext/taglib/Makefile.am +++ b/ext/taglib/Makefile.am @@ -2,16 +2,16 @@ plugin_LTLIBRARIES = libgsttaglib.la libgsttaglib_la_SOURCES = gsttaglibmux.c gstid3v2mux.cc gstapev2mux.cc libgsttaglib_la_CFLAGS = \ - $(GST_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) \ $(TAGLIB_CFLAGS) libgsttaglib_la_CXXFLAGS = \ - $(GST_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) \ $(TAGLIB_CFLAGS) libgsttaglib_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \ $(GST_LIBS) \ - $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ \ $(TAGLIB_LIBS) libgsttaglib_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) |