diff options
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | gst/modplug/Makefile.am | 17 |
2 files changed, 3 insertions, 16 deletions
@@ -36,7 +36,7 @@ version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autocon version_check "automake" "$AUTOMAKE automake automake-1.7 automake-1.6 automake-1.5" \ "ftp://ftp.gnu.org/pub/gnu/automake/" 1 5 || DIE=1 version_check "libtool" "" \ - "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || DIE=1 + "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1 version_check "pkg-config" "" \ "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1 diff --git a/gst/modplug/Makefile.am b/gst/modplug/Makefile.am index 1aecfc34..a784ddd3 100644 --- a/gst/modplug/Makefile.am +++ b/gst/modplug/Makefile.am @@ -5,21 +5,8 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmodplug.la libgstmodplug_la_SOURCES = modplug_types.cc gstmodplug.cc -libgstmodplug_la_CFLAGS = $(GST_CFLAGS) -libgstmodplug_la_CXXFLAGS = $(GST_CFLAGS) +libgstmodplug_la_CPPFLAGS = $(GST_CFLAGS) libgstmodplug_la_LIBADD = $(top_builddir)/gst/modplug/libmodplug/libmodplug.la -# we add stdc++ because it'll be used by C programs -libgstmodplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lstdc++ +libgstmodplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstmodplug.h modplug_types.h - -# this is the silliest hack I ever did, but for some reason some dependency -# tracking is not able to figure out that the actual file is gstmodplug.cc -# I appreciate any help into fixing this mess definitively -# I suspect a libtool bug, because in the end it doesn't even *use* the .c -# file; my libtool version when seeing this bug was 1.4.2 -gstmodplug.c: gstmodplug.cc - cp $(srcdir)/gstmodplug.cc gstmodplug.c - -modplug_types.c: modplug_types.cc - cp $(srcdir)/modplug_types.cc modplug_types.c |