X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mozilla%2FMakefile.am;h=4c3c909c010ff1e4062a294224ef6eab9ce3122b;hb=6a73573370bfd2f4fb49480074c65b9634f05b3a;hp=2144ed147292ab2f50982dc245245e36dee77548;hpb=d86fd15629ed0d4ad3909ec43a4e654f62b2f9e2;p=vlc

diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index 2144ed1472..4c3c909c01 100644
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -3,111 +3,148 @@
 ###############################################################################
 
 noinst_LIBRARIES = $(noinst_LIBRARIES_mozilla)
-	                                     
-MOSTLYCLEANFILES = $(LIBRARIES_mozilla)
-EXTRA_DIST = $(SOURCES_mozilla) vlcintf.idl
-BUILT_SOURCES = $(BUILT_SOURCES_mozilla)
 
-SOURCES_mozilla = \
+MOSTLYCLEANFILES = $(npvlc_DATA) $(vlcintf_xpt_DATA)
+CLEANFILES = stamp-pic $(BUILT_SOURCES)
+EXTRA_DIST = $(DIST_sources) vlcintf.idl npvlc_rc.rc vlc.r
+
+SOURCES_mozilla_common = \
 	vlcshell.cpp \
 	vlcplugin.cpp \
 	vlcplugin.h \
 	vlcpeer.cpp \
 	vlcpeer.h \
-	support/classinfo.h \
-	$(SOURCES_win32) \
-	$(SOURCES_macosx) \
-	$(SOURCES_unix) \
-	$(NULL)
+	support/classinfo.h
+
+DIST_sources = $(SOURCES_mozilla_common) \
+	support/npwin.cpp support/npmac.cpp support/npunix.c
+
+if BUILD_SHARED
+LIBRARIES_libvlc_pic = -Wl,-rpath '$(libdir)' -L$(top_builddir)/src -lvlc
+LIBRARIES_libvlc_nopic = $(LIBRARIES_libvlc_pic)
+else
+LIBRARIES_libvlc_pic = $(top_builddir)/src/libvlc_pic.a
+LIBRARIES_libvlc_nopic = $(top_builddir)/src/libvlc.a
+endif
+
+if BUILD_MOZILLA
 
 # Under Win32, Mozilla plugins need to be named NP******.DLL, but under Unix
 # the common naming scheme is lib******plugin.so. Also, we need npwin.cpp
 # under Win32 and npunix.c under Unix.
 if HAVE_WIN32
-LIBRARIES_mozilla = npvlc$(LIBEXT)
-SOURCES_win32 = support/npwin.cpp
+
+LIBRARIES_libvlc = $(LIBRARIES_libvlc_nopic)
+npvlc = npvlc$(LIBEXT)
+npvlcdir = $(libdir)
+noinst_DATA = npvlc_rc.$(OBJEXT)
+
+SOURCES_support = support/npwin.cpp
 CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
+LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc)
+
+DATA_npvlc_rc = $(noinst_npvlc_rc_DATA)
+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 $@
+
 else
 if HAVE_DARWIN
-# We don't define LIBRARIES_mozilla because we'll be using project builder, or not...
-BUNDLE_mozilla = VLC\ Plugin.plugin
 
-vlc_moz_FLAGS = `$(VLC_CONFIG) --libs vlc builtin pic mozilla`
-moz_CFLAGS = `$(MOZILLA_CONFIG) --cflags plugin java nspr/obsolete nspr oji xpcom xpconnect`
-moz_plugin_FLAGS = -c -F/System/Library/Frameworks/CoreFoundation.framework $(moz_CFLAGS) -I/Developer/Headers/FlatCarbon -arch ppc -fno-common -fpascal-strings -O0 -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -DXP_MACOSX=1 -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 -g -include mozilla-config.h
+LIBRARIES_libvlc = $(LIBRARIES_libvlc_nopic)
+npvlc = npvlc$(LIBEXT)
+npvlcdir = $(libdir)
+noinst_DATA = npvlc.rsrc VLC\ Plugin.plugin
+MOSTLYCLEANFILES += npvlc.rsrc
+CLEANFILES += VLC\ Plugin.plugin
+
+SOURCES_support = support/npmac.cpp
+CPPFLAGS_mozilla_EXTRA = -I. -I$(top_builddir) -I$(srcdir)/../include -c \
+	-F/System/Library/Frameworks/CoreFoundation.framework $(moz_CFLAGS) \
+	-I/Developer/Headers/FlatCarbon -arch ppc -fno-common -fpascal-strings \
+	-O0 -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -DXP_MACOSX=1 \
+	-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
+
+npvlc.rsrc: $(srcdir)/vlc.r
+	/Developer/Tools/Rez -useDF /Developer/Headers/FlatCarbon/Types.r $< -o $@
+
+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 -)
 
 else
-LIBRARIES_mozilla = libvlcplugin$(LIBEXT)
-SOURCES_unix = support/npunix.c
-endif
-endif
 
-if BUILD_MOZILLA
-if UNTRUE
-noinst_LIBRARIES_mozilla = libplugin.a
+LIBRARIES_libvlc = $(LIBRARIES_libvlc_pic)
+npvlc = libvlcplugin$(LIBEXT)
+npvlcdir = $(libdir)/mozilla/plugins
+SOURCES_support = support/npunix.c
+noinst_DATA =
+
+LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc)
+endif
 endif
 
-libplugin_a_SOURCES = $(SOURCES_mozilla)
-libplugin_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \
-	             $(CPPFLAGS_mozilla_EXTRA) -Imozilla
-libplugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \
-	               $(CPPFLAGS_mozilla_EXTRA) -Imozilla
-libplugin_a_DEPENDENCIES = $(DATA_npvlc_rc)
+noinst_LIBRARIES_mozilla = libnpvlc.a
 
-BUILT_SOURCES_mozilla = vlcintf.h
 $(SOURCES_mozilla): vlcintf.h
 
-plugin_DATA = $(LIBRARIES_mozilla) $(BUNDLE_mozilla)
-plugindir = $(libdir)/mozilla/plugins
-$(LIBRARIES_mozilla): $(libplugin_a_OBJECTS) \
-	              $(libplugin_a_DEPENDENCIES) stamp-pic
-	$(CXXLINK) $(libplugin_a_OBJECTS) $(DATA_npvlc_rc) \
-	  $(top_builddir)/lib/libvlc_pic.a -shared \
-	  `$(VLC_CONFIG) --libs vlc mozilla builtin pic`
-
+BUILT_SOURCES = vlcintf.h
 vlcintf_xpt_DATA = vlcintf.xpt
+
+if USE_LIBTOOL
+# FIXME: name is incorrect on Win32 & Darwin
+npvlc_LTLIBRARIES = libvlcplugin.la
+else
+npvlc_DATA = $(npvlc)
+EXTRA_LIBRARIES = libnpvlc.a
+endif
+endif
+
+libvlcplugin_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support)
+libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla`
+libvlcplugin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla`
+libvlcplugin_la_LDFLAGS = `$(VLC_CONFIG) --libs mozilla` -module -shrext $(LIBEXT)
+libvlcplugin_la_LIBADD = ../src/libvlc.la
+
+libnpvlc_a_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support)
+libnpvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla $(pic)` \
+	             $(CPPFLAGS_mozilla_EXTRA)
+libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla $(pic)` \
+	               $(CPPFLAGS_mozilla_EXTRA)
+LDFLAGS_libnpvlc = $(LDFLAGS_npvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin $(pic)`
+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
-	$(XPIDL) -I/usr/share/idl/mozilla -I/usr/lib/mozilla/include/idl \
+	$(XPIDL) $(XPIDL_INCL) \
 	  -m typelib -o vlcintf $(srcdir)/vlcintf.idl
 
 vlcintf.h: vlcintf.idl
-	$(XPIDL) -I/usr/share/idl/mozilla -I/usr/lib/mozilla/include/idl \
+	$(XPIDL) $(XPIDL_INCL) \
 	  -m header -o vlcintf $(srcdir)/vlcintf.idl
 
-if HAVE_WIN32
-DATA_npvlc_rc = $(noinst_npvlc_rc_DATA)
-noinst_npvlc_rc_DATA = npvlc_rc.$(OBJEXT)
-noinst_npvlc_rcdir = $(libdir)
-npvlc_rc.$(OBJEXT): npvlc_rc.rc
-	$(WINDRES) --include-dir $(srcdir) -i $< -o $@
-endif
-if HAVE_DARWIN
-VLC\ Plugin.plugin:
-	rm -rf $(srcdir)/VLC\ Plugin.plugin
-	mkdir -p $(srcdir)/VLC\ Plugin.plugin/Contents/MacOS
-	mkdir -p $(srcdir)/VLC\ Plugin.plugin/Contents/Resources
-	/usr/bin/g++3 $(moz_plugin_FLAGS) $(srcdir)/vlcplugin.cpp -o $(srcdir)/libplugin_a-vlcplugin.o
-	/usr/bin/g++3 $(moz_plugin_FLAGS) $(srcdir)/vlcshell.cpp -o $(srcdir)/libplugin_a-vlcshell.o
-	/usr/bin/g++3 $(moz_plugin_FLAGS) $(srcdir)/vlcpeer.cpp -o $(srcdir)/libplugin_a-vlcpeer.o
-	/usr/bin/g++3 $(moz_plugin_FLAGS) $(srcdir)/support/npmac.cpp -o $(srcdir)/libplugin_a-npmac.o
-	/usr/bin/g++3 $(srcdir)/libplugin_a-vlcplugin.o $(srcdir)/libplugin_a-vlcshell.o $(srcdir)/libplugin_a-vlcpeer.o $(srcdir)/libplugin_a-npmac.o -o $(srcdir)/VLC\ Plugin.plugin/Contents/MacOS/VLC\ Plugin -L/usr/lib -F/System/Library/Frameworks/CoreFoundation.framework -framework CoreFoundation -arch ppc -bundle -read_only_relocs suppress $(top_srcdir)/lib/libvlc_pic.a -dylib $(vlc_moz_FLAGS)
-	cp $(top_srcdir)/extras/MacOSX/plugin/Info.plist $(srcdir)/VLC\ Plugin.plugin/Contents/Info.plist
-	cp $(top_srcdir)/extras/MacOSX/plugin/pbdevelopment.plist $(srcdir)/VLC\ Plugin.plugin/Contents/pbdevelopment.plist
-	cp -r $(top_srcdir)/extras/MacOSX/plugin/English.lproj $(srcdir)/VLC\ Plugin.plugin/Contents/Resources/
-	Rez /Developer/Headers/FlatCarbon/Types.r $(srcdir)/vlc.r -o $(srcdir)/VLC\ Plugin.plugin/Contents/Resources/Vlc\ Plugin.rsrc
-endif
-endif
-
 ###############################################################################
 # Stamp rules
 ###############################################################################
-clean: clean-stamp clean-bundle
-clean-stamp:
-	rm -f stamp-pic
-
-stamp-pic: FORCE
-	@for dep in "" `$(VLC_CONFIG) --target builtin pic`; do \
+stamp-pic:
+	@for dep in "" `$(VLC_CONFIG) --target builtin $(pic)`; do \
 	  if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \
 	    rm -f $@; \
 	    break; \
@@ -115,10 +152,7 @@ stamp-pic: FORCE
 	done
 	@if test ! -f $@; then printf "" > $@; fi
 
-clean-bundle:
-	rm -rf $(srcdir)/VLC\ Plugin.plugin
-
 ###############################################################################
 # Force rule
 ###############################################################################
-FORCE:
+.PHONY: stamp-pic