[xiph-commits] r3475 - in browser_plugin/trunk: . src

[j at svn.annodex.net]

Author: j
Date: 2008-02-16 05:13:47 -0800 (Sat, 16 Feb 2008)
New Revision: 3475

Added:
   browser_plugin/trunk/test/
Removed:
   browser_plugin/trunk/src/Make-rules-linux
   browser_plugin/trunk/src/Make-rules-mac
   browser_plugin/trunk/src/test/
Modified:
   browser_plugin/trunk/Makefile.am
   browser_plugin/trunk/src/Makefile.am
Log:
* move test to toplevel
* update autofoo to include mac files in build
* autotools is linux / x11 only, remove unused mac rules



Modified: browser_plugin/trunk/Makefile.am
===================================================================
--- browser_plugin/trunk/Makefile.am	2008-02-16 12:50:18 UTC (rev 3474)
+++ browser_plugin/trunk/Makefile.am	2008-02-16 13:13:47 UTC (rev 3475)
@@ -32,4 +32,11 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+EXTRA_DIST = \
+	mac/Info.plist \
+	mac/README \
+	mac/liboggplay.r \
+	mac/liboggplay.xcodeproj/project.pbxproj \
+	test/test.html
+
 SUBDIRS = src

Deleted: browser_plugin/trunk/src/Make-rules-linux
===================================================================
--- browser_plugin/trunk/src/Make-rules-linux	2008-02-16 12:50:18 UTC (rev 3474)
+++ browser_plugin/trunk/src/Make-rules-linux	2008-02-16 13:13:47 UTC (rev 3475)
@@ -1,5 +0,0 @@
-XPIDL=/usr/lib/firefox/xpidl
-XPIDL_INCLUDE=-I/usr/share/idl/firefox
-XPTLINK=/usr/lib/firefox/xpt_link
-INCLUDES=-I/usr/include/firefox/plugin -I/usr/include/firefox -I/usr/include/firefox/xpcom -I/usr/include/firefox/string -I/usr/include/firefox/java -I/usr/include/firefox/nspr -I/usr/include/nspr -I$(srcdir)/include -I$(srcdir)/support -I$(srcdir)/audio -I$(top_srcdir)/include `pkg-config --cflags gtk+-2.0`
-PLATFORM_SOURCES=plugin_gui_linux.c

Deleted: browser_plugin/trunk/src/Make-rules-mac
===================================================================
--- browser_plugin/trunk/src/Make-rules-mac	2008-02-16 12:50:18 UTC (rev 3474)
+++ browser_plugin/trunk/src/Make-rules-mac	2008-02-16 13:13:47 UTC (rev 3475)
@@ -1,4 +0,0 @@
-XPIDL=3rdparty/xpidl.mac
-XPIDL_INCLUDE=-I/Developer/gecko-sdk/idl
-INCLUDES=-I/Developer/gecko-sdk/include -I$(srcdir)/include -I$(srcdir)/support
-PLATFORM_SOURCES=plugin_gui_mac.c

Modified: browser_plugin/trunk/src/Makefile.am
===================================================================
--- browser_plugin/trunk/src/Makefile.am	2008-02-16 12:50:18 UTC (rev 3474)
+++ browser_plugin/trunk/src/Makefile.am	2008-02-16 13:13:47 UTC (rev 3475)
@@ -1,9 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST= \
-	Make-rules-linux		\
-	Make-rules-mac			\
-	test/test.html			\
+	audio/sydney_audio_new.h	\
+	audio/sydney_audio_mac.c	\
+	support/np_mac.cpp		\
+	plugin_gui_mac.c 		\
+	plugin_gui_win32.c 		\
 	win32/liboggplugin.def		\
 	win32/liboggplugin.rc		\
 	win32/liboggplugin.vcproj	\
@@ -15,7 +17,10 @@
 			-g $(SSE2_CFLAGS) -Wno-strict-aliasing $(OGGZ_CFLAGS) \
 			$(IMLIB2_CFLAGS) $(OGGPLAY_CFLAGS) -Wdeclaration-after-statement
 
-include $(srcdir)/Make-rules-$(PLATFORM)
+XPIDL=/usr/lib/firefox/xpidl
+XPIDL_INCLUDE=-I/usr/share/idl/firefox
+XPTLINK=/usr/lib/firefox/xpt_link
+INCLUDES=-I/usr/include/firefox/plugin -I/usr/include/firefox -I/usr/include/firefox/xpcom -I/usr/include/firefox/string -I/usr/include/firefox/java -I/usr/include/firefox/nspr -I/usr/include/nspr -I$(srcdir)/include -I$(srcdir)/support -I$(srcdir)/audio -I$(top_srcdir)/include `pkg-config --cflags gtk+-2.0`
 
 OGGPLAY_STATICLIBS = $(LIBDIR)/liboggplay.a $(LIBDIR)/liboggz.a $(LIBDIR)/libtheora.a $(LIBDIR)/libfishsound.a $(LIBDIR)/libvorbis.a $(LIBDIR)/libvorbisenc.a $(LIBDIR)/libspeex.a $(LIBDIR)/libogg.a $(LIBDIR)/libImlib2.a
 

Copied: browser_plugin/trunk/test (from rev 3472, browser_plugin/trunk/src/test)