X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=projects%2Fmozilla%2FMakefile.am;h=230b720b04a46d78a98afe252b7c155dc7ccab3a;hb=addf17f0887177964c56bd27856f88de3f0e3509;hp=f03bc99e7f220482fc5f1f29e7c89eb030394894;hpb=6d9fde80110542d213ed6236efc134931da58066;p=vlc

diff --git a/projects/mozilla/Makefile.am b/projects/mozilla/Makefile.am
index f03bc99e7f..230b720b04 100644
--- a/projects/mozilla/Makefile.am
+++ b/projects/mozilla/Makefile.am
@@ -4,18 +4,18 @@
 
 MOSTLYCLEANFILES = 
 CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = $(DIST_sources) install.js npvlc_rc.rc vlc.r
+EXTRA_DIST = $(DIST_sources) npvlc_rc.rc.in COPYING npvlc.dll.manifest
 
 SOURCES_mozilla_common = \
 	vlcshell.cpp \
+	vlcshell.h \
 	vlcplugin.cpp \
 	vlcplugin.h \
 	control/npolibvlc.cpp \
 	control/npolibvlc.h \
-	control/npovlc.cpp \
-	control/npovlc.h \
 	control/nporuntime.cpp \
 	control/nporuntime.h \
+	control/position.h \
 	support/classinfo.h
 
 DIST_sources = $(SOURCES_mozilla_common) \
@@ -51,9 +51,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
@@ -69,8 +67,7 @@ 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
+	-DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 
 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
 
@@ -87,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 $@
 
 #
@@ -108,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 \