Moz-Plugin: Deinterlace JS Binding

[vlc] / projects / mozilla / Makefile.am

diff --git a/projects/mozilla/Makefile.am b/projects/mozilla/Makefile.am
index b6f0213dba48892a42c9617841156e3730387968..6d1bc6fdce10a76ef4ead034b67177e43c4117eb 100644 (file)
--- a/projects/mozilla/Makefile.am
+++ b/projects/mozilla/Makefile.am
@@ -4,10 +4,11 @@
 
 MOSTLYCLEANFILES = 
 CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = $(DIST_sources) install.js npvlc_rc.rc vlc.r
+EXTRA_DIST = $(DIST_sources) npvlc_rc.rc.in COPYING
 
 SOURCES_mozilla_common = \
        vlcshell.cpp \
+       vlcshell.h \
        vlcplugin.cpp \
        vlcplugin.h \
        control/npolibvlc.cpp \
@@ -49,9 +50,7 @@ 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/'` \
-               --include-dir $(srcdir) -i $< -o $@
+       $(WINDRES) --include-dir $(srcdir) -i $< -o $@
 
 else
 if HAVE_DARWIN
@@ -85,7 +84,7 @@ noinst_DATA = npvlc.rsrc VLC\ Plugin.plugin
 MOSTLYCLEANFILES += npvlc.rsrc
 CLEANFILES += VLC\ Plugin.plugin
 
-npvlc.rsrc: $(srcdir)/vlc.r
+npvlc.rsrc: vlc.r
        /Developer/Tools/Rez -useDF /Developer/Headers/FlatCarbon/Types.r $< -o $@
 
 #
@@ -106,47 +105,15 @@ endef
 
 VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES)
        rm -Rf "$@"
-       $(INSTALL) -d "$@/Contents/MacOS/lib"
-       $(INSTALL) ".libs/npvlc.dylib" "$@/Contents/MacOS/VLC Plugin"
-       $(INSTALL) -d "$(srcdir)/$@/Contents/MacOS/lib"; \
-       install_name_tool -change "$(libdir)/libvlccore.0.dylib" \
-           "@executable_path/lib/libvlccore.dylib" \
-           "$@/Contents/MacOS/VLC Plugin"
-       install_name_tool -change "$(libdir)/libvlc.2.dylib" \
-           "@executable_path/lib/libvlc.dylib" \
-           "$@/Contents/MacOS/VLC Plugin"
-       $(INSTALL) "$(top_builddir)/src/.libs/libvlccore.0.dylib" \
-           "$@/Contents/MacOS/lib/libvlccore.dylib"
-       $(INSTALL) "$(top_builddir)/src/.libs/libvlc.2.dylib" \
-           "$@/Contents/MacOS/lib/libvlc.dylib"
-       install_name_tool -change "$(libdir)/libvlccore.0.dylib" \
-           "@executable_path/lib/libvlccore.dylib" \
-           "$@/Contents/MacOS/lib/libvlc.dylib"
-       dylib="$@/Contents/MacOS/VLC Plugin"; $(FIXEXECPATH) ;
-       dylib="$@/Contents/MacOS/lib/libvlccore.dylib"; $(FIXEXECPATH) ;
-       dylib="$@/Contents/MacOS/lib/libvlc.dylib"; $(FIXEXECPATH) ;
-       $(INSTALL) -d "$@/Contents/Resources"
-       $(INSTALL) npvlc.rsrc "$@/Contents/Resources/VLC Plugin.rsrc"
-       cp -r "$(top_srcdir)/extras/package/macosx/plugin/English.lproj" "$@/Contents/Resources/"
-       $(INSTALL) "$(top_srcdir)/extras/package/macosx/plugin/Info.plist" "$@/Contents/Info.plist"
-       $(INSTALL) -d "$@/Contents/MacOS/modules"
-       find $(top_srcdir)/modules/ -name '*_plugin.$(LIBEXT)' | \
-       while read i; do \
-         if test -n "$$i" ; then \
-           dylib="$@/Contents/MacOS/modules/`basename $$i`"; \
-           $(INSTALL) "$$i" "$$dylib"; \
-           install_name_tool -change "$(libdir)/libvlccore.0.dylib" \
-               "@executable_path/lib/libvlccore.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="$@/Contents/MacOS/lib/`basename $${i}`" ; \
-           $(INSTALL) -m 644 "$${i}" "$$dylib" ; \
-           $(FIXEXECPATH); \
-         done ; \
-       fi
+       $(INSTALL) -d "VLC-Plugin.plugin/Contents/MacOS/lib"
+       $(INSTALL) -d "VLC-Plugin.plugin/Contents/Resources"
+       ACTION="release-makefile" PRODUCT="VLC-Plugin.plugin" src_dir=$(srcdir) build_dir=$(top_builddir) sh "$(top_srcdir)/projects/macosx/framework/Pre-Compile.sh"
+       $(INSTALL) npvlc.rsrc "VLC-Plugin.plugin/Contents/Resources/VLC Plugin.rsrc"
+       $(INSTALL) "$(top_builddir)/extras/package/macosx/plugin/Info.plist" "VLC-Plugin.plugin/Contents/Info.plist"
+       mv "VLC-Plugin.plugin" "VLC Plugin.plugin"
+       find "VLC Plugin.plugin" -type d -exec chmod ugo+rx '{}' \;
+       find "VLC Plugin.plugin" -type f -exec chmod ugo+r '{}' \;
+
 # 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 \