From 37822dc3fbfa52df6a992aae0532b06e606623db Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 25 Apr 2005 13:29:40 +0000 Subject: [PATCH] Fix part of the build. Come on guys, autogen didn't even work :) Original commit message from CVS: Fix part of the build. Come on guys, autogen didn't even work :) --- ChangeLog | 7 +++++++ configure.ac | 2 -- gst/audioconvert/Makefile.am | 8 ++++---- gst/audioscale/Makefile.am | 9 ++++----- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbf4b72844..44a5fc6913 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-04-25 Thomas Vander Stichele + + * configure.ac: + * gst/audioconvert/Makefile.am: + * gst/audioscale/Makefile.am: + Fix part of the build. Come on guys, autogen didn't even work :) + 2005-04-25 Ronald S. Bultje * configure.ac: diff --git a/configure.ac b/configure.ac index b2236c7e40..98f54fe2ca 100644 --- a/configure.ac +++ b/configure.ac @@ -930,8 +930,6 @@ pkgconfig/gstreamer-interfaces.pc pkgconfig/gstreamer-interfaces-uninstalled.pc pkgconfig/gstreamer-libs.pc pkgconfig/gstreamer-libs-uninstalled.pc -pkgconfig/gstreamer-media-info.pc -pkgconfig/gstreamer-media-info-uninstalled.pc pkgconfig/gstreamer-plugins.pc pkgconfig/gstreamer-plugins-uninstalled.pc po/Makefile.in diff --git a/gst/audioconvert/Makefile.am b/gst/audioconvert/Makefile.am index 66d2f00ee5..c016165a41 100644 --- a/gst/audioconvert/Makefile.am +++ b/gst/audioconvert/Makefile.am @@ -18,7 +18,7 @@ noinst_HEADERS = \ #TESTS = channelmixtest #noinst_PROGRAMS = channelmixtest -channelmixtest_CFLAGS = $(GST_CFLAGS) -channelmixtest_LDADD = libgstaudioconvert.la \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la -channelmixtest_LDFLAGS = $(GST_LIBS) +#channelmixtest_CFLAGS = $(GST_CFLAGS) +#channelmixtest_LDADD = libgstaudioconvert.la \ +# $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la +#channelmixtest_LDFLAGS = $(GST_LIBS) diff --git a/gst/audioscale/Makefile.am b/gst/audioscale/Makefile.am index ea24f4f37a..beeeea7d65 100644 --- a/gst/audioscale/Makefile.am +++ b/gst/audioscale/Makefile.am @@ -1,11 +1,10 @@ - #plugin_LTLIBRARIES = libgstaudioscale.la noinst_LTLIBRARIES = libgstresample.la -libgstaudioscale_la_SOURCES = gstaudioscale.c -libgstaudioscale_la_CFLAGS = $(GST_CFLAGS) -libgstaudioscale_la_LIBADD = -libgstaudioscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +#libgstaudioscale_la_SOURCES = gstaudioscale.c +#libgstaudioscale_la_CFLAGS = $(GST_CFLAGS) +#libgstaudioscale_la_LIBADD = +#libgstaudioscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstaudioscale.h private.h