[xiph-commits] r3600 - browser_plugin/trunk/src

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-05-24 02:34:48 -0700 (Sat, 24 May 2008)
New Revision: 3600

Modified:
   browser_plugin/trunk/src/Makefile.am
Log:
use OGGPLAY prefix rather than LIBOGGPLAY in src/Makefile.am


Modified: browser_plugin/trunk/src/Makefile.am
===================================================================
--- browser_plugin/trunk/src/Makefile.am	2008-05-05 08:53:09 UTC (rev 3599)
+++ browser_plugin/trunk/src/Makefile.am	2008-05-24 09:34:48 UTC (rev 3600)
@@ -11,16 +11,16 @@
 	win32/resource.h
 
 AM_CXXFLAGS = -Wall -Wno-non-virtual-dtor -Werror -DXP_UX -DMOZ_X11 -DUSE_AUDIO -shared \
-			-g $(SSE2_CFLAGS) -Wno-strict-aliasing $(OGGZ_CFLAGS) $(LIBOGGPLAY_CFLAGS)
+			-g $(SSE2_CFLAGS) -Wno-strict-aliasing $(OGGZ_CFLAGS) $(OGGPLAY_CFLAGS)
 AM_CFLAGS = -Wall -Werror -DXP_UX -DMOZ_X11 -DUSE_AUDIO -shared \
 	-g $(SSE2_CFLAGS) -Wno-strict-aliasing $(X_CFLAGS) $(OGGZ_CFLAGS) \
-	$(ALSA_CFLAGS) $(IMLIB2_CFLAGS) $(LIBOGGPLAY_CFLAGS) \
+	$(ALSA_CFLAGS) $(IMLIB2_CFLAGS) $(OGGPLAY_CFLAGS) \
 	-Wdeclaration-after-statement
 
 
 INCLUDES=-I$(srcdir)/include -I$(srcdir)/support -I$(srcdir)/audio @GTK_CFLAGS@ @FIREFOX_CFLAGS@
 
-LIBOGGPLAY_STATICLIBS = @LIBDIR@/liboggplay.a @LIBDIR@/liboggz.a @LIBDIR@/libtheora.a @LIBDIR@/libfishsound.a @LIBDIR@/libvorbis.a @LIBDIR@/libvorbisenc.a @LIBDIR@/libspeex.a @LIBDIR@/libFLAC.a @LIBDIR@/libogg.a @LIBDIR@/libImlib2.a
+OGGPLAY_STATICLIBS = @LIBDIR@/liboggplay.a @LIBDIR@/liboggz.a @LIBDIR@/libtheora.a @LIBDIR@/libfishsound.a @LIBDIR@/libvorbis.a @LIBDIR@/libvorbisenc.a @LIBDIR@/libspeex.a @LIBDIR@/libFLAC.a @LIBDIR@/libogg.a @LIBDIR@/libImlib2.a
 
 
 noinst_HEADERS = \
@@ -51,10 +51,10 @@
 	support/npn_gate.cpp			\
 	audio/sydney_audio_alsa.c		\
 	plugin_cmml.c
-libnpoggplugin_la_LIBADD = $(X_LIBS) $(LIBOGGPLAY_LIBS) $(ALSA_LIBS) $(IMLIB2_LIBS) $(PTHREAD_LIBS)
+libnpoggplugin_la_LIBADD = $(X_LIBS) $(OGGPLAY_LIBS) $(ALSA_LIBS) $(IMLIB2_LIBS) $(PTHREAD_LIBS)
 
 libnpoggplugin_static_la_SOURCES = $(libnpoggplugin_la_SOURCES)
-libnpoggplugin_static_la_LIBADD = $(X_LIBS) $(LIBOGGPLAY_STATICLIBS) $(PTHREAD_LIBS) ${ALSA_LIBS}
+libnpoggplugin_static_la_LIBADD = $(X_LIBS) $(OGGPLAY_STATICLIBS) $(PTHREAD_LIBS) ${ALSA_LIBS}
 
 EXTRA_libnpoggplugin_la_SOURCES = nsILibOggPlugin.idl
 nodist_libnpoggplugin_la_SOURCES = nsILibOggPlugin.h