[xiph-commits] r3111 - liboggplay/trunk/plugin

[shans at svn.annodex.net]

Author: shans
Date: 2007-06-27 23:18:41 -0700 (Wed, 27 Jun 2007)
New Revision: 3111

Modified:
   liboggplay/trunk/plugin/Makefile.am
Log:
Build both dynamic and static versions of plugin



Modified: liboggplay/trunk/plugin/Makefile.am
===================================================================
--- liboggplay/trunk/plugin/Makefile.am	2007-06-28 06:18:13 UTC (rev 3110)
+++ liboggplay/trunk/plugin/Makefile.am	2007-06-28 06:18:41 UTC (rev 3111)
@@ -18,10 +18,11 @@
 include $(srcdir)/Make-rules-$(PLATFORM)
 
 OGGPLAYDIR = ../src/liboggplay
-OGGPLAY_LIBS = $(OGGPLAYDIR)/liboggplay.la @OGGZ_LIBS@ @THEORA_LIBS@ @FISHSOUND_LIBS@
+OGGPLAY_DYNLIBS = $(OGGPLAYDIR)/liboggplay.la @OGGZ_LIBS@ @THEORA_LIBS@ @FISHSOUND_LIBS@
+OGGPLAY_LIBS = xpi/liboggplay.a xpi/liboggz.a xpi/libtheora.a xpi/libfishsound.a xpi/libvorbis.a xpi/libvorbisenc.a xpi/libspeex.a xpi/libogg.a xpi/libImlib2.a
 
 if HAVE_IMLIB2
-plugin_libs=libnpoggplugin.la
+plugin_libs=libnpoggplugin.la  libnpoggplugin_dynamic.la
 endif
 
 noinst_HEADERS = \
@@ -49,15 +50,28 @@
 	support/npn_gate.cpp           \
 	audio/sydney_audio_oss.c
   #support/npunix.c	
+libnpoggplugin_dynamic_la_SOURCES = \
+	plugin.cpp                     \
+	support/nsScriptablePeer.cpp   \
+	plugin_oggplay.c               \
+	plugin_gui_linux.c             \
+	plugin_tools.c                 \
+	support/npp_gate.cpp           \
+	support/np_entry.cpp           \
+	support/npn_gate.cpp           \
+	audio/sydney_audio_oss.c
 
-libnpoggplugin_la_LIBADD = -lX11 -lXt $(OGGPLAY_LIBS) $(IMLIB2_LIBS) $(PTHREAD_LIBS)
+libnpoggplugin_la_LIBADD = -lX11 -lXt $(OGGPLAY_LIBS) $(PTHREAD_LIBS)
 
+
+libnpoggplugin_dynamic_la_LIBADD = -lX11 -lXt $(OGGPLAY_DYNLIBS) $(IMLIB2_LIBS) $(PTHREAD_LIBS)
+
 EXTRA_libnpoggplugin_la_SOURCES = nsILibOggPlugin.idl
 nodist_libnpoggplugin_la_SOURCES = nsILibOggPlugin.h
-BUILT_SOURCES = nsILibOggPlugin.h
+BUILT_SOURCES = nsILibOggPlugin.h xpi/liboggplay.a
 CLEANFILES = nsILibOggPlugin.h nsILibOggPlugin.xpt
-nsILibOggPlugin.h: nsILibOggPlugin.idl
+nsILibOggPlugin.h: nsILibOggPlugin.idl xpi/liboggplay.a
 	$(XPIDL) -m header $(XPIDL_INCLUDE) $(srcdir)/nsILibOggPlugin.idl
 	$(XPIDL) -m typelib $(XPIDL_INCLUDE) $(srcdir)/nsILibOggPlugin.idl
-	$(XPTLINK) npliboggplugin.xpt nsILibOggPlugin.xpt
-DISTCLEANFILES = npliboggplugin.xpt
+xpi/liboggplay.a: ../src/liboggplay/.libs/liboggplay.a
+	cp ../src/liboggplay/.libs/liboggplay.a xpi