summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2006-06-11 13:57:19 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2006-06-11 13:57:19 +0000
commit5a027ffd66994bc4f7c9b5103af3ed0c60f7503b (patch)
tree84cb0f66b3b909125c7a5071091854fd19a6001f /sys
parentb469e7235cbd4efb6086c19b276f8d09ed261207 (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 'sys')
-rw-r--r--sys/oss/Makefile.am13
-rw-r--r--sys/sunaudio/Makefile.am4
-rw-r--r--sys/ximage/Makefile.am3
3 files changed, 6 insertions, 14 deletions
diff --git a/sys/oss/Makefile.am b/sys/oss/Makefile.am
index 079444be..9677ac85 100644
--- a/sys/oss/Makefile.am
+++ b/sys/oss/Makefile.am
@@ -8,13 +8,11 @@ libgstossaudio_la_SOURCES = gstossaudio.c \
gstosssink.c \
gstosssrc.c
-# gstossdmabuffer.c
-
libgstossaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstossaudio_la_LIBADD = \
- -lgstinterfaces-@GST_MAJORMINOR@ \
- -lgstaudio-@GST_MAJORMINOR@ \
$(GST_PLUGINS_BASE_LIBS) \
+ -lgstinterfaces-$(GST_MAJORMINOR) \
+ -lgstaudio-$(GST_MAJORMINOR) \
$(GST_LIBS)
libgstossaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
@@ -26,10 +24,3 @@ noinst_HEADERS = common.h \
gstossmixer.h \
gstossmixerelement.h \
gstossmixertrack.h
-
-# noinst_PROGRAMS = #oss_probe
-
-# oss_probe_SOURCES = oss_probe.c
-# oss_probe_CFLAGS = $(GST_CFLAGS)
-# oss_probe_LDADD = $(GLIB_LIBS)
-
diff --git a/sys/sunaudio/Makefile.am b/sys/sunaudio/Makefile.am
index 95e5f9e8..1f7e1214 100644
--- a/sys/sunaudio/Makefile.am
+++ b/sys/sunaudio/Makefile.am
@@ -8,9 +8,9 @@ libgstsunaudio_la_SOURCES = gstsunaudio.c \
libgstsunaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstsunaudio_la_LIBADD = \
- -lgstinterfaces-@GST_MAJORMINOR@ \
- -lgstaudio-@GST_MAJORMINOR@ \
$(GST_PLUGINS_BASE_LIBS) \
+ -lgstinterfaces-$(GST_MAJORMINOR) \
+ -lgstaudio-(GST_MAJORMINOR) \
$(GST_LIBS)
libgstsunaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/sys/ximage/Makefile.am b/sys/ximage/Makefile.am
index 1a25c775..74ea9d15 100644
--- a/sys/ximage/Makefile.am
+++ b/sys/ximage/Makefile.am
@@ -3,7 +3,8 @@ plugin_LTLIBRARIES = libgstximagesrc.la
libgstximagesrc_la_SOURCES = gstximagesrc.c ximageutil.c
libgstximagesrc_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) \
- $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+ $(GST_BASE_CFLAGS) \
+ $(GST_CFLAGS) \
$(X_CFLAGS) $(XFIXES_CFLAGS) $(XDAMAGE_CFLAGS)
libgstximagesrc_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \