X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mozilla%2FMakefile.am;h=04a6c87ec22a6da87499211b6f2b2645bfc35375;hb=599cf09858843cd2cd97a022b942205c14184f0d;hp=09641494706d3028abd778c304c03b88dba8f8cb;hpb=56d009adf4a23a631465516c4590ef0be5520435;p=vlc diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am index 0964149470..04a6c87ec2 100644 --- a/mozilla/Makefile.am +++ b/mozilla/Makefile.am @@ -2,150 +2,181 @@ # Building the Mozilla plugin ############################################################################### -noinst_LIBRARIES = $(noinst_LIBRARIES_mozilla) - -MOSTLYCLEANFILES = $(LIBRARIES_mozilla) $(npvlc_DATA) $(DATA_npvlc_rsrc) $(vlcintf_xpt_DATA) -EXTRA_DIST = $(SOURCES_mozilla) $(DIST_rsrc) $(DIST_misc) -BUILT_SOURCES = $(BUILT_SOURCES_mozilla) +MOSTLYCLEANFILES = +CLEANFILES = $(BUILT_SOURCES) +EXTRA_DIST = $(DIST_sources) install.js npvlc_rc.rc vlc.r -SOURCES_mozilla = \ +SOURCES_mozilla_common = \ vlcshell.cpp \ vlcplugin.cpp \ vlcplugin.h \ - vlcpeer.cpp \ - vlcpeer.h \ - support/classinfo.h \ - $(SOURCES_support) \ - $(NULL) + control/npolibvlc.cpp \ + control/npolibvlc.h \ + control/npovlc.cpp \ + control/npovlc.h \ + control/nporuntime.cpp \ + control/nporuntime.h \ + support/classinfo.h -DIST_rsrc = \ - $(SOURCES_rsrc) \ - $(NULL) +DIST_sources = $(SOURCES_mozilla_common) \ + support/npwin.cpp support/npmac.cpp support/npunix.c -DIST_misc = \ - vlcintf.idl \ - $(NULL) +if BUILD_MOZILLA -LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a +LIBRARIES_libvlc = $(top_builddir)/src/libvlc-control.la \ + $(top_builddir)/src/libvlc.la -if BUILD_MOZILLA +if HAVE_WIN32 # 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. -if HAVE_WIN32 - - -npvlc_DATA = npvlc$(LIBEXT) -npvlcdir = $(libdir) +# +lib_LTLIBRARIES = npvlc.la SOURCES_support = support/npwin.cpp -SOURCES_rsrc = npvlc_rc.rc CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32 +LDFLAGS_mozilla_EXTRA = -no-undefined -Wl,--kill-at -Wl,$(DATA_npvlc_rc) + +npvlc_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support) +npvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` $(CPPFLAGS_mozilla_extra) +npvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla` $(CPPFLAGS_mozilla_extra) +npvlc_la_DEPENDENCIES = $(DATA_npvlc_rc) $(LIBRARIES_libvlc) +npvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags mozilla` -module -avoid-version \ + $(LDFLAGS_mozilla_EXTRA) +npvlc_la_LIBADD = `$(VLC_CONFIG) -libs mozilla` $(LIBRARIES_libvlc) DATA_npvlc_rc = $(noinst_npvlc_rc_DATA) noinst_npvlc_rc_DATA = npvlc_rc.$(OBJEXT) -noinst_npvlc_rcdir = $(libdir) +noinst_npvlc_rcdir = + npvlc_rc.$(OBJEXT): npvlc_rc.rc - $(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 $@ -LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin` + $(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 $@ else if HAVE_DARWIN -npvlc_DATA = npvlc$(LIBEXT) -npvlcdir = $(libdir) +# +# MacOS X +# -BUNDLE_mozilla = VLC\ Plugin.plugin -SOURCES_support = support/npmac.cpp -SOURCES_rsrc = vlc.r +lib_LTLIBRARIES = npvlc.la -CPPFLAGS_mozilla_EXTRA = -I. -I$(top_builddir) -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 +SOURCES_support = support/npmac.cpp +CPPFLAGS_mozilla_EXTRA = -I. -I$(top_builddir) -I$(srcdir)/../include -c \ + -F/System/Library/Frameworks/CoreFoundation.framework $(moz_CFLAGS) \ + -I/Developer/Headers/FlatCarbon -fno-common -fpascal-strings \ + -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -DXP_MACOSX=1 \ + -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 \ + -include mozilla-config.h +LDFLAGS_mozilla_EXTRA = -no-undefined -bundle -Wl,-read_only_relocs -Wl,suppress \ + -Wl,-headerpad_max_install_names -shrext $(LIBEXT) -Wl,-framework,Carbon -Wl,-framework,System + +npvlc_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support) +npvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` $(CPPFLAGS_mozilla_EXTRA) +npvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla` $(CPPFLAGS_mozilla_EXTRA) +npvlc_la_DEPENDENCIES = $(LIBRARIES_libvlc) +npvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags mozilla` -module -avoid-version \ + $(LDFLAGS_mozilla_EXTRA) +npvlc_la_LIBADD = `$(VLC_CONFIG) -libs mozilla` $(LIBRARIES_libvlc) + + +noinst_DATA = npvlc.rsrc VLC\ Plugin.plugin +MOSTLYCLEANFILES += npvlc.rsrc +CLEANFILES += VLC\ Plugin.plugin -DATA_npvlc_rsrc = $(noinst_npvlc_rsrc_DATA) -noinst_npvlc_rsrc_DATA = npvlc.rsrc -noinst_npvlc_rsrcdir = $(libdir) npvlc.rsrc: $(srcdir)/vlc.r /Developer/Tools/Rez -useDF /Developer/Headers/FlatCarbon/Types.r $< -o $@ -LDFLAGS_npvlc = -arch ppc -bundle -read_only_relocs suppress $(LIBRARIES_libvlc) -dylib `$(VLC_CONFIG) --libs mozilla vlc builtin $(pic)` - -DATA_bundle = $(noinst_bundle_DATA) -noinst_bundle_DATA = VLC\ Plugin.plugin -noinst_bundledir = $(libdir) - -VLC\ Plugin.plugin: npvlc.rsrc npvlc.dylib - rm -rf "$@" - mkdir -p "./$@/Contents/MacOS" - cp npvlc.dylib "./$@/Contents/MacOS/VLC Plugin" - mkdir -p ./"$@"/Contents/Resources - cp npvlc.rsrc "./$@/Contents/Resources/VLC Plugin.rsrc" - cp -r $(top_srcdir)/extras/MacOSX/plugin/English.lproj "./$@/Contents/Resources/" - cp $(top_srcdir)/extras/MacOSX/plugin/Info.plist "./$@/Contents/Info.plist" - (cd $(top_builddir)/VLC.app/Contents/MacOS/; tar cf - modules)| \ - (cd "./$@/Contents/MacOS"; tar xf -) + +# +# Plugin uses shared libraries that are located relatively through @executable_path, +# which unfortunately references the path of the App using the Plugin, rather than the +# Plugin itself. Since this Plugin should always be installed in '/Library/Internet Plug-Ins', +# it is safer to force dylibs to locate dependants through a fixed path +# +define FIXEXECPATH + otool -L "$$dylib" | \ + awk -v libdylib="$$dylib" ' \ + /@executable_path/ { \ + newpath=$$1 ; \ + sub("@executable_path","/Library/Internet Plug-Ins/VLC Plugin.plugin/Contents/MacOS",newpath) ; \ + print "install_name_tool -change \""$$1"\" \""newpath"\" \""libdylib"\"" ; \ + }' | sh -x +endef + +VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES) + rm -Rf "$@" + $(INSTALL) -d "$(srcdir)/$@/Contents/MacOS" + $(INSTALL) "$(srcdir)/.libs/npvlc.dylib" "$(srcdir)/$@/Contents/MacOS/VLC Plugin" + $(INSTALL) -d "$(srcdir)/$@/Contents/MacOS/lib"; \ + install_name_tool -change "$(libdir)/libvlc.1.dylib" \ + "@executable_path/lib/libvlc.dylib" \ + "$(srcdir)/$@/Contents/MacOS/VLC Plugin" + install_name_tool -change "$(libdir)/libvlc-control.1.dylib" \ + "@executable_path/lib/libvlc-control.dylib" \ + "$(srcdir)/$@/Contents/MacOS/VLC Plugin" + $(INSTALL) "$(top_builddir)/src/.libs/libvlc.1.dylib" \ + "$(srcdir)/$@/Contents/MacOS/lib/libvlc.dylib" + $(INSTALL) "$(top_builddir)/src/.libs/libvlc-control.1.dylib" \ + "$(srcdir)/$@/Contents/MacOS/lib/libvlc-control.dylib" + install_name_tool -change "$(libdir)/libvlc.1.dylib" \ + "@executable_path/lib/libvlc.dylib" \ + "$(srcdir)/$@/Contents/MacOS/lib/libvlc-control.dylib" + dylib="$(srcdir)/$@/Contents/MacOS/VLC Plugin"; $(FIXEXECPATH) ; + dylib="$(srcdir)/$@/Contents/MacOS/lib/libvlc.dylib"; $(FIXEXECPATH) ; + dylib="$(srcdir)/$@/Contents/MacOS/lib/libvlc-control.dylib"; $(FIXEXECPATH) ; + $(INSTALL) -d "$(srcdir)/$@/Contents/Resources" + $(INSTALL) npvlc.rsrc "$(srcdir)/$@/Contents/Resources/VLC Plugin.rsrc" + cp -r "$(top_srcdir)/extras/MacOSX/plugin/English.lproj" "$(srcdir)/$@/Contents/Resources/" + $(INSTALL) "$(top_srcdir)/extras/MacOSX/plugin/Info.plist" "$(srcdir)/$@/Contents/Info.plist" + $(INSTALL) -d "$(srcdir)/$@/Contents/MacOS/modules" + for i in "" `$(VLC_CONFIG) --target plugin` ; do \ + if test -n "$$i" ; then \ + dylib="$(srcdir)/$@/Contents/MacOS/modules/`basename $$i$(LIBEXT)`"; \ + $(INSTALL) "`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" "$$dylib"; \ + install_name_tool -change "$(libdir)/libvlc.1.dylib" \ + "@executable_path/lib/libvlc.dylib" "$$dylib"; \ + $(FIXEXECPATH) ; \ + fi ; \ + done + if test -d $(top_srcdir)/extras/contrib/vlc-lib; then \ + for i in $(top_srcdir)/extras/contrib/vlc-lib/*.dylib ; do \ + dylib="$(srcdir)/$@/Contents/MacOS/lib/`basename $${i}`" ; \ + $(INSTALL) -m 644 "$${i}" "$$dylib" ; \ + $(FIXEXECPATH); \ + done ; \ + fi +# uncomment if dependencies on XPCOM libs is sought +# if test -d "$(MOZILLA_SDK_PATH)/lib"; then \ +# for i in "$(MOZILLA_SDK_PATH)"/lib/*.dylib ; do \ +# dylib="$(srcdir)/$@/Contents/MacOS/`basename $${i}`" ; \ +# $(INSTALL) -m 644 "$${i}" "$$dylib" ; \ +# $(FIXEXECPATH); \ +# done ; \ +# fi else -npvlc_DATA = libvlcplugin$(LIBEXT) -npvlcdir = $(libdir)/mozilla/plugins +# +# UNIX/Others platforms +# -SOURCES_support = support/npunix.c +npvlc_LTLIBRARIES = libvlcplugin.la -LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin $(pic)` +npvlc = libvlcplugin$(LIBEXT) +npvlcdir = $(libdir)/mozilla/plugins +SOURCES_support = support/npunix.c +libvlcplugin_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support) +libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` +libvlcplugin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla` +libvlcplugin_la_LDFLAGS = `$(VLC_CONFIG) --ldflags mozilla` -module -avoid-version -shrext $(LIBEXT) +libvlcplugin_la_LIBADD = $(LIBRARIES_libvlc) `$(VLC_CONFIG) -libs mozilla` +# automake gets confused by the ../.. +libvlcplugin_la_DEPENDENCIES = $(AM_LIBADD) endif endif - -noinst_LIBRARIES_mozilla = libnpvlc.a - -libnpvlc_a_SOURCES = $(SOURCES_mozilla) -libnpvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla $(pic)` \ - $(CPPFLAGS_mozilla_EXTRA) -libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla $(pic)` \ - $(CPPFLAGS_mozilla_EXTRA) -libnpvlc_a_DEPENDENCIES = $(DATA_npvlc_rc) - -BUILT_SOURCES_mozilla = vlcintf.h -$(SOURCES_mozilla): vlcintf.h - -$(npvlc_DATA): $(libnpvlc_a_OBJECTS) \ - $(libnpvlc_a_DEPENDENCIES) stamp-pic - $(CXXLINK) $(libnpvlc_a_OBJECTS) $(DATA_npvlc_rc) \ - $(LDFLAGS_npvlc) - -vlcintf_xpt_DATA = vlcintf.xpt -vlcintf_xptdir = $(libdir)/mozilla/components -vlcintf.xpt: vlcintf.idl - $(XPIDL) $(XPIDL_INCL) \ - -m typelib -o vlcintf $(srcdir)/vlcintf.idl - -vlcintf.h: vlcintf.idl - $(XPIDL) $(XPIDL_INCL) \ - -m header -o vlcintf $(srcdir)/vlcintf.idl - endif -############################################################################### -# Stamp rules -############################################################################### -clean-local: clean-stamp clean-bundle - -clean-bundle: - rm -rf ./VLC\ Plugin.plugin - -clean-stamp: - rm -f stamp-pic - -stamp-pic: FORCE - @for dep in "" `$(VLC_CONFIG) --target builtin $(pic)`; do \ - if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \ - rm -f $@; \ - break; \ - fi; \ - done - @if test ! -f $@; then printf "" > $@; fi - -############################################################################### -# Force rule -############################################################################### -FORCE: