Release the display mode when we are done with it.

[vlc] / projects / mozilla / Makefile.am

diff --git a/projects/mozilla/Makefile.am b/projects/mozilla/Makefile.am
index 3c9720f1803a870f99e74378b29d7e74c34788a4..230b720b04a46d78a98afe252b7c155dc7ccab3a 100644 (file)
--- a/projects/mozilla/Makefile.am
+++ b/projects/mozilla/Makefile.am
@@ -4,16 +4,18 @@
 
 MOSTLYCLEANFILES = 
 CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = $(DIST_sources) install.js npvlc_rc.rc.in 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/nporuntime.cpp \
        control/nporuntime.h \
+       control/position.h \
        support/classinfo.h
 
 DIST_sources = $(SOURCES_mozilla_common) \
@@ -65,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
 
@@ -83,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 $@
 
 #
@@ -104,15 +105,14 @@ endef
 
 VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES)
        rm -Rf "$@"
-       $(INSTALL) -d "$@/Contents/MacOS/lib"
-       $(INSTALL) -d "$@/Contents/Resources"
-       $(INSTALL) .libs/npvlc.dylib "$@/Contents/MacOS/VLC Plugin"
-       dylib="$@/Contents/MacOS/VLC Plugin"; $(FIXEXECPATH);
-       $(INSTALL) npvlc.rsrc "$@/Contents/Resources/VLC Plugin.rsrc"
-       cp -r "$(top_srcdir)/extras/package/macosx/plugin/English.lproj" "$@/Contents/Resources/"
-       cp -r "$(top_builddir)/extras/package/macosx/plugin/English.lproj" "$@/Contents/Resources/"
-       $(INSTALL) "$(top_builddir)/extras/package/macosx/plugin/Info.plist" "$@/Contents/Info.plist"
-   ACTION="release-makefile" PRODUCT="VLC Plugin.plugin" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
+       $(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 \