svn:ignore

[vlc] / mozilla / Makefile.am

diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index ff7f441ba02f29fb1b4a4369ac3eae4c53d4f726..6d6b6f505af5cec883b04865e0fc1ad2e762ffde 100644 (file)
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -4,7 +4,7 @@
 
 noinst_LIBRARIES = $(noinst_LIBRARIES_mozilla)
                                             
-MOSTLYCLEANFILES = $(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)
 
@@ -26,6 +26,12 @@ DIST_misc = \
        vlcintf.idl \
        $(NULL)
 
+if BUILD_SHARED
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc$(LIBEXT)
+else
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a
+endif
+
 if BUILD_MOZILLA
 
 # Under Win32, Mozilla plugins need to be named NP******.DLL, but under Unix
@@ -33,7 +39,6 @@ if BUILD_MOZILLA
 # under Win32 and npunix.c under Unix.
 if HAVE_WIN32
 
-LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a
 
 npvlc_DATA = npvlc$(LIBEXT)
 npvlcdir = $(libdir)
@@ -52,8 +57,6 @@ LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc) `$(VLC_CONFIG) --libs mozilla vlc bu
 else
 if HAVE_DARWIN
 
-LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a
-
 npvlc_DATA = npvlc$(LIBEXT)
 npvlcdir = $(libdir)
 
@@ -67,7 +70,7 @@ 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 /Developer/Headers/FlatCarbon/Types.r $< -o $@
+       /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)
@@ -77,19 +80,16 @@ noinst_bundledir = $(libdir)
 VLC\ Plugin.plugin: npvlc.rsrc npvlc.dylib
        rm -rf "$@"
        mkdir -p "./$@/Contents/MacOS"
-       cp npvlc.dylib "./$@/Contents/MacOS/$@"
+       cp npvlc.dylib "./$@/Contents/MacOS/VLC Plugin"
        mkdir -p ./"$@"/Contents/Resources
-       ditto -rsrcFork npvlc.rsrc "./$@/Contents/MacOS/$@.rsrc"
-       cp $(top_srcdir)/extras/MacOSX/plugin/Info.plist "./$@/Contents/Info.plist"
-       cp $(top_srcdir)/extras/MacOSX/plugin/pbdevelopment.plist "./$@/Contents/pbdevelopment.plist"
+       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 -)
 
 else
 
-LIBRARIES_libvlc = $(top_builddir)/lib/libvlc_pic.a
-
 npvlc_DATA = libvlcplugin$(LIBEXT)
 npvlcdir = $(libdir)/mozilla/plugins