Make Mozilla plugin scriptable (e.g. so that the Javascript 'onclick'

[vlc] / mozilla / Makefile.am

diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index 0e384ec66113bd06e0033a03cfcc1de97b3080a7..93f872d1d0efe89828b7a7f6156deb4c48ec861d 100644 (file)
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -5,7 +5,7 @@
 noinst_LIBRARIES = $(noinst_LIBRARIES_mozilla)
                                             
 MOSTLYCLEANFILES = $(LIBRARIES_mozilla)
-EXTRA_DIST = $(SOURCES_mozilla) vlcintf.idl
+EXTRA_DIST = $(SOURCES_mozilla) $(DIST_rsrc) vlcintf.idl
 BUILT_SOURCES = $(BUILT_SOURCES_mozilla)
 
 SOURCES_mozilla = \
@@ -20,6 +20,10 @@ SOURCES_mozilla = \
        $(SOURCES_unix) \
        $(NULL)
 
+DIST_rsrc = \
+       npvlc_rc.rc \
+       $(NULL)
+
 # Under Win32, Mozilla plugins need to be named NP******.DLL, but under Unix
 # the common naming scheme is lib******plugin.so. Also, we need npwin.cpp
 # under Win32 and npunix.c under Unix.
@@ -27,6 +31,7 @@ if HAVE_WIN32
 LIBRARIES_mozilla = npvlc$(LIBEXT)
 SOURCES_win32 = support/npwin.cpp
 CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
+LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a
 else
 if HAVE_DARWIN
 # We don't define LIBRARIES_mozilla because we'll be using project builder, or not...
@@ -35,10 +40,14 @@ BUNDLE_mozilla = VLC\ Plugin.plugin
 vlc_moz_FLAGS = `$(VLC_CONFIG) --libs vlc builtin pic mozilla`
 moz_CFLAGS = `$(MOZILLA_CONFIG) --cflags plugin java nspr/obsolete nspr oji xpcom xpconnect`
 moz_plugin_FLAGS = -I$(srcdir)/../include -c -F/System/Library/Frameworks/CoreFoundation.framework $(moz_CFLAGS) -I/Developer/Headers/FlatCarbon -arch ppc -fno-common -fpascal-strings -O0 -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -DXP_MACOSX=1 -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 -g -include mozilla-config.h
+pic = pic
+LIBRARIES_libvlc = $(top_builddir)/lib/libvlc_pic.a
 
 else
 LIBRARIES_mozilla = libvlcplugin$(LIBEXT)
 SOURCES_unix = support/npunix.c
+pic = pic
+LIBRARIES_libvlc = $(top_builddir)/lib/libvlc_pic.a
 endif
 endif
 
@@ -48,9 +57,9 @@ noinst_LIBRARIES_mozilla = libplugin.a
 endif
 
 libplugin_a_SOURCES = $(SOURCES_mozilla)
-libplugin_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \
+libplugin_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla $(pic)` \
                     $(CPPFLAGS_mozilla_EXTRA) -Imozilla
-libplugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \
+libplugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla $(pic)` \
                       $(CPPFLAGS_mozilla_EXTRA) -Imozilla
 libplugin_a_DEPENDENCIES = $(DATA_npvlc_rc)
 
@@ -62,8 +71,8 @@ plugindir = $(libdir)/mozilla/plugins
 $(LIBRARIES_mozilla): $(libplugin_a_OBJECTS) \
                      $(libplugin_a_DEPENDENCIES) stamp-pic
        $(CXXLINK) $(libplugin_a_OBJECTS) $(DATA_npvlc_rc) \
-         $(top_builddir)/lib/libvlc_pic.a -shared \
-         `$(VLC_CONFIG) --libs vlc mozilla builtin pic`
+         $(LIBRARIES_libvlc) -shared \
+         `$(VLC_CONFIG) --libs vlc mozilla builtin $(pic)`
 
 vlcintf_xpt_DATA = vlcintf.xpt
 vlcintf_xptdir = $(libdir)/mozilla/components
@@ -82,7 +91,7 @@ DATA_npvlc_rc = $(noinst_npvlc_rc_DATA)
 noinst_npvlc_rc_DATA = npvlc_rc.$(OBJEXT)
 noinst_npvlc_rcdir = $(libdir)
 npvlc_rc.$(OBJEXT): npvlc_rc.rc
-       $(WINDRES) --include-dir $(srcdir) -i $< -o $@
+       $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir) -i $< -o $@
 endif
 if HAVE_DARWIN
 VLC\ Plugin.plugin:
@@ -93,7 +102,7 @@ VLC\ Plugin.plugin:
        /usr/bin/g++3 $(moz_plugin_FLAGS) $(srcdir)/vlcshell.cpp -o $(srcdir)/libplugin_a-vlcshell.o
        /usr/bin/g++3 $(moz_plugin_FLAGS) $(srcdir)/vlcpeer.cpp -o $(srcdir)/libplugin_a-vlcpeer.o
        /usr/bin/g++3 $(moz_plugin_FLAGS) $(srcdir)/support/npmac.cpp -o $(srcdir)/libplugin_a-npmac.o
-       /usr/bin/g++3 $(srcdir)/libplugin_a-vlcplugin.o $(srcdir)/libplugin_a-vlcshell.o $(srcdir)/libplugin_a-vlcpeer.o $(srcdir)/libplugin_a-npmac.o -o $(srcdir)/VLC\ Plugin.plugin/Contents/MacOS/VLC\ Plugin -L/usr/lib -F/System/Library/Frameworks/CoreFoundation.framework -framework CoreFoundation -arch ppc -bundle -read_only_relocs suppress $(top_srcdir)/lib/libvlc_pic.a -dylib $(vlc_moz_FLAGS)
+       /usr/bin/g++3 $(srcdir)/libplugin_a-vlcplugin.o $(srcdir)/libplugin_a-vlcshell.o $(srcdir)/libplugin_a-vlcpeer.o $(srcdir)/libplugin_a-npmac.o -o $(srcdir)/VLC\ Plugin.plugin/Contents/MacOS/VLC\ Plugin -L/usr/lib -F/System/Library/Frameworks/CoreFoundation.framework -framework CoreFoundation -arch ppc -bundle -read_only_relocs suppress $(LIBRARIES_libvlc) -dylib $(vlc_moz_FLAGS)
        cp $(top_srcdir)/extras/MacOSX/plugin/Info.plist $(srcdir)/VLC\ Plugin.plugin/Contents/Info.plist
        cp $(top_srcdir)/extras/MacOSX/plugin/pbdevelopment.plist $(srcdir)/VLC\ Plugin.plugin/Contents/pbdevelopment.plist
        cp -r $(top_srcdir)/extras/MacOSX/plugin/English.lproj $(srcdir)/VLC\ Plugin.plugin/Contents/Resources/
@@ -111,7 +120,7 @@ clean-stamp:
        rm -f stamp-pic
 
 stamp-pic: FORCE
-       @for dep in "" `$(VLC_CONFIG) --target builtin pic`; do \
+       @for dep in "" `$(VLC_CONFIG) --target builtin $(pic)`; do \
          if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \
            rm -f $@; \
            break; \