Simplification assuming that sizeof(char) = 1

[vlc] / mozilla / Makefile.am

diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index 139d16557ea3d0bd21ebed8665324e88a44f08e3..74ed52e5c958c793a6380625f4be330ef05a45f8 100644 (file)
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -14,10 +14,12 @@ SOURCES_mozilla_common = \
        vlcplugin.h \
        vlcpeer.cpp \
        vlcpeer.h \
+       vlcruntime.cpp \
+       vlcruntime.h \
        support/classinfo.h
 
 DIST_sources = $(SOURCES_mozilla_common) \
-       support/npwin.cpp support/npmac.cpp support/npunix.cpp
+       support/npwin.cpp support/npmac.cpp support/npunix.c
 
 if BUILD_SHARED
 LIBRARIES_libvlc_pic = -Wl,-rpath '$(libdir)' -L$(top_builddir)/src -lvlc
@@ -41,9 +43,12 @@ noinst_DATA = npvlc_rc.$(OBJEXT)
 
 SOURCES_support = support/npwin.cpp
 CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
-LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc)
+LDFLAGS_npvlc = -shared -Wl,--kill-at $(LIBRARIES_libvlc)
 
 DATA_npvlc_rc = $(noinst_npvlc_rc_DATA)
+noinst_npvlc_rc_DATA = npvlc_rc.$(OBJEXT)
+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/'` \
@@ -67,21 +72,59 @@ CPPFLAGS_mozilla_EXTRA = -I. -I$(top_builddir) -I$(srcdir)/../include -c \
        -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 -g \
        -include mozilla-config.h
 LDFLAGS_npvlc = -arch ppc -bundle -read_only_relocs suppress \
-       $(LIBRARIES_libvlc) -dylib
+       $(LIBRARIES_libvlc) -dylib -headerpad_max_install_names 
 
 npvlc.rsrc: $(srcdir)/vlc.r
        /Developer/Tools/Rez -useDF /Developer/Headers/FlatCarbon/Types.r $< -o $@
 
+#
+# 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 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 -)
+       rm -Rf "$@"
+       $(INSTALL) -d "./$@/Contents/MacOS"
+       $(INSTALL) npvlc.dylib "./$@/Contents/MacOS/VLC Plugin"
+       dylib="./$@/Contents/MacOS/VLC Plugin"; $(FIXEXECPATH) ;
+       $(INSTALL) -d "./$@/Contents/Resources"
+       $(INSTALL) npvlc.rsrc "./$@/Contents/Resources/VLC Plugin.rsrc"
+       cp -r "$(top_srcdir)/extras/MacOSX/plugin/English.lproj" "./$@/Contents/Resources/"
+       $(INSTALL) "$(top_srcdir)/extras/MacOSX/plugin/Info.plist" "./$@/Contents/Info.plist"
+       $(INSTALL) -d "./$@/Contents/MacOS/modules"
+       for i in "" `$(VLC_CONFIG) --target plugin` ; do \
+         if test -n "$$i" ; then \
+           dylib="./$@/Contents/MacOS/modules/`basename $$i$(LIBEXT)`"; \
+           $(INSTALL) "$$i$(LIBEXT)" "$$dylib"; \
+           $(FIXEXECPATH) ; \
+         fi ; \
+       done
+       if test -d $(top_srcdir)/extras/contrib/vlc-lib; then \
+         $(INSTALL) -d "./$@/Contents/MacOS/lib"; \
+         for i in $(top_srcdir)/extras/contrib/vlc-lib/*.dylib ; do \
+           dylib="./$@/Contents/MacOS/lib/`basename $${i}`" ; \
+           $(INSTALL) -m 644 "$${i}" "$$dylib" ; \
+           $(FIXEXECPATH); \
+         done ; \
+       fi
+       if test -d "$(MOZILLA_SDK_PATH)/lib"; then \
+         for i in "$(MOZILLA_SDK_PATH)"/lib/*.dylib ; do \
+           dylib="./$@/Contents/MacOS/`basename $${i}`" ; \
+           $(INSTALL) -m 644 "$${i}" "$$dylib" ; \
+           $(FIXEXECPATH); \
+         done ; \
+       fi
 
 else
 
@@ -128,6 +171,8 @@ libnpvlc_a_DEPENDENCIES = $(DATA_npvlc_rc)
 $(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic
        $(CXXLINK) $(libnpvlc_a_OBJECTS) $(DATA_npvlc_rc) \
         $(LDFLAGS_libnpvlc)
+# Cygwin work-around
+       @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
 
 vlcintf_xptdir = $(libdir)/mozilla/components
 vlcintf.xpt: vlcintf.idl