[gst-cvs] thomasvs gst-plugins: gst-plugins/gst/modplug/ gst-plugins/gst/modplug/libmodplug/

[Thomas V. S. <tho...@us...>]

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     thomasvs
Date:           Thu Nov 28 2002  12:32:01 PST

Log message:
this dir is kicking my ass all over the place

Modified files:
    gst/modplug     : Makefile.am modplug_types.c
    gst/modplug/libmodplug: Makefile.am

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/modplug/Makefile.am.diff?r1=1.9&r2=1.10
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/modplug/modplug_types.c.diff?r1=1.2&r2=1.3
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/modplug/libmodplug/Makefile.am.diff?r1=1.3&r2=1.4

====Begin Diffs====
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst/modplug/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.am	23 Nov 2002 09:35:43 -0000	1.9
+++ Makefile.am	28 Nov 2002 20:31:48 -0000	1.10
@@ -4,10 +4,10 @@
 
 plugin_LTLIBRARIES = libgstmodplug.la
 
-libgstmodplug_la_SOURCES = gstmodplug.cc modplug_types.cc
+libgstmodplug_la_SOURCES = modplug_types.c gstmodplug.cc
 libgstmodplug_la_CFLAGS = $(GST_CFLAGS)
 libgstmodplug_la_CXXFLAGS = $(GST_CFLAGS)
-libgstmodplug_la_LIBADD = libmodplug/libmodplug.la -lstdc++
+libgstmodplug_la_LIBADD = $(top_builddir)/gst/modplug/libmodplug/libmodplug.la
 libgstmodplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstmodplug.h modplug_types.h
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst/modplug/libmodplug/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	6 Oct 2002 13:50:34 -0000	1.3
+++ Makefile.am	28 Nov 2002 20:31:48 -0000	1.4
@@ -2,7 +2,6 @@
 
 libmodplug_la_CXXFLAGS = -fno-exceptions -Wall -ffast-math -D_REENTRANT
 libmodplug_la_LDFLAGS = -module -avoid-version
-libmodplug_la_LIBS = -lstdc++
 libmodplug_la_SOURCES = tables.cpp         \
                         sndmix.cpp         \
                         sndfile.cpp        \