X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mozilla%2FMakefile.am;h=04a6c87ec22a6da87499211b6f2b2645bfc35375;hb=599cf09858843cd2cd97a022b942205c14184f0d;hp=74ed52e5c958c793a6380625f4be330ef05a45f8;hpb=20defc2a2b12f52fdf5c09c51451a62b0e2edf0d;p=vlc

diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index 74ed52e5c9..04a6c87ec2 100644
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -2,48 +2,49 @@
 # Building the Mozilla plugin
 ###############################################################################
 
-noinst_LIBRARIES = $(noinst_LIBRARIES_mozilla)
-
-MOSTLYCLEANFILES = $(npvlc_DATA) $(vlcintf_xpt_DATA)
-CLEANFILES = stamp-pic $(BUILT_SOURCES)
-EXTRA_DIST = $(DIST_sources) vlcintf.idl npvlc_rc.rc vlc.r
+MOSTLYCLEANFILES = 
+CLEANFILES = $(BUILT_SOURCES)
+EXTRA_DIST = $(DIST_sources) install.js npvlc_rc.rc vlc.r
 
 SOURCES_mozilla_common = \
 	vlcshell.cpp \
 	vlcplugin.cpp \
 	vlcplugin.h \
-	vlcpeer.cpp \
-	vlcpeer.h \
-	vlcruntime.cpp \
-	vlcruntime.h \
+	control/npolibvlc.cpp \
+	control/npolibvlc.h \
+	control/npovlc.cpp \
+	control/npovlc.h \
+	control/nporuntime.cpp \
+	control/nporuntime.h \
 	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
 
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc-control.la \
+				   $(top_builddir)/src/libvlc.la
+
+if HAVE_WIN32
+
 # 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_libvlc = $(LIBRARIES_libvlc_nopic)
-npvlc = npvlc$(LIBEXT)
-npvlcdir = $(libdir)
-noinst_DATA = npvlc_rc.$(OBJEXT)
+#
+lib_LTLIBRARIES = npvlc.la
 
 SOURCES_support = support/npwin.cpp
 CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
-LDFLAGS_npvlc = -shared -Wl,--kill-at $(LIBRARIES_libvlc)
+LDFLAGS_mozilla_EXTRA = -no-undefined -Wl,--kill-at -Wl,$(DATA_npvlc_rc)
+
+npvlc_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support)
+npvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` $(CPPFLAGS_mozilla_extra)
+npvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla` $(CPPFLAGS_mozilla_extra)
+npvlc_la_DEPENDENCIES = $(DATA_npvlc_rc) $(LIBRARIES_libvlc)
+npvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags mozilla` -module -avoid-version \
+				   $(LDFLAGS_mozilla_EXTRA)
+npvlc_la_LIBADD = `$(VLC_CONFIG) -libs mozilla` $(LIBRARIES_libvlc)
 
 DATA_npvlc_rc = $(noinst_npvlc_rc_DATA)
 noinst_npvlc_rc_DATA = npvlc_rc.$(OBJEXT)
@@ -57,22 +58,34 @@ npvlc_rc.$(OBJEXT): npvlc_rc.rc
 else
 if HAVE_DARWIN
 
-LIBRARIES_libvlc = $(LIBRARIES_libvlc_nopic)
-npvlc = npvlc$(LIBEXT)
-npvlcdir = $(libdir)
-noinst_DATA = npvlc.rsrc VLC\ Plugin.plugin
-MOSTLYCLEANFILES += npvlc.rsrc
-CLEANFILES += VLC\ Plugin.plugin
+#
+# MacOS X
+#
+
+lib_LTLIBRARIES = npvlc.la
 
 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 \
+	-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
-LDFLAGS_npvlc = -arch ppc -bundle -read_only_relocs suppress \
-	$(LIBRARIES_libvlc) -dylib -headerpad_max_install_names 
+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
+
+npvlc_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support)
+npvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` $(CPPFLAGS_mozilla_EXTRA)
+npvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla` $(CPPFLAGS_mozilla_EXTRA) 
+npvlc_la_DEPENDENCIES = $(LIBRARIES_libvlc)
+npvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags mozilla` -module -avoid-version \
+				   $(LDFLAGS_mozilla_EXTRA)
+npvlc_la_LIBADD = `$(VLC_CONFIG) -libs mozilla` $(LIBRARIES_libvlc)
+
+
+noinst_DATA = npvlc.rsrc VLC\ Plugin.plugin
+MOSTLYCLEANFILES += npvlc.rsrc
+CLEANFILES += VLC\ Plugin.plugin
 
 npvlc.rsrc: $(srcdir)/vlc.r
 	/Developer/Tools/Rez -useDF /Developer/Headers/FlatCarbon/Types.r $< -o $@
@@ -93,109 +106,77 @@ define FIXEXECPATH
 	}' | sh -x
 endef
 
-VLC\ Plugin.plugin: npvlc.rsrc npvlc.dylib
+VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES)
 	rm -Rf "$@"
-	$(INSTALL) -d "./$@/Contents/MacOS"
-	$(INSTALL) npvlc.dylib "./$@/Contents/MacOS/VLC Plugin"
-	dylib="./$@/Contents/MacOS/VLC Plugin"; $(FIXEXECPATH) ;
-	$(INSTALL) -d "./$@/Contents/Resources"
-	$(INSTALL) npvlc.rsrc "./$@/Contents/Resources/VLC Plugin.rsrc"
-	cp -r "$(top_srcdir)/extras/MacOSX/plugin/English.lproj" "./$@/Contents/Resources/"
-	$(INSTALL) "$(top_srcdir)/extras/MacOSX/plugin/Info.plist" "./$@/Contents/Info.plist"
-	$(INSTALL) -d "./$@/Contents/MacOS/modules"
+	$(INSTALL) -d "$(srcdir)/$@/Contents/MacOS"
+	$(INSTALL) "$(srcdir)/.libs/npvlc.dylib" "$(srcdir)/$@/Contents/MacOS/VLC Plugin"
+	$(INSTALL) -d "$(srcdir)/$@/Contents/MacOS/lib"; \
+	install_name_tool -change "$(libdir)/libvlc.1.dylib" \
+	    "@executable_path/lib/libvlc.dylib" \
+	    "$(srcdir)/$@/Contents/MacOS/VLC Plugin"
+	install_name_tool -change "$(libdir)/libvlc-control.1.dylib" \
+	    "@executable_path/lib/libvlc-control.dylib" \
+	    "$(srcdir)/$@/Contents/MacOS/VLC Plugin"
+	$(INSTALL) "$(top_builddir)/src/.libs/libvlc.1.dylib" \
+	    "$(srcdir)/$@/Contents/MacOS/lib/libvlc.dylib"
+	$(INSTALL) "$(top_builddir)/src/.libs/libvlc-control.1.dylib" \
+	    "$(srcdir)/$@/Contents/MacOS/lib/libvlc-control.dylib"
+	install_name_tool -change "$(libdir)/libvlc.1.dylib" \
+	    "@executable_path/lib/libvlc.dylib" \
+	    "$(srcdir)/$@/Contents/MacOS/lib/libvlc-control.dylib"
+	dylib="$(srcdir)/$@/Contents/MacOS/VLC Plugin"; $(FIXEXECPATH) ;
+	dylib="$(srcdir)/$@/Contents/MacOS/lib/libvlc.dylib"; $(FIXEXECPATH) ;
+	dylib="$(srcdir)/$@/Contents/MacOS/lib/libvlc-control.dylib"; $(FIXEXECPATH) ;
+	$(INSTALL) -d "$(srcdir)/$@/Contents/Resources"
+	$(INSTALL) npvlc.rsrc "$(srcdir)/$@/Contents/Resources/VLC Plugin.rsrc"
+	cp -r "$(top_srcdir)/extras/MacOSX/plugin/English.lproj" "$(srcdir)/$@/Contents/Resources/"
+	$(INSTALL) "$(top_srcdir)/extras/MacOSX/plugin/Info.plist" "$(srcdir)/$@/Contents/Info.plist"
+	$(INSTALL) -d "$(srcdir)/$@/Contents/MacOS/modules"
 	for i in "" `$(VLC_CONFIG) --target plugin` ; do \
 	  if test -n "$$i" ; then \
-	    dylib="./$@/Contents/MacOS/modules/`basename $$i$(LIBEXT)`"; \
-	    $(INSTALL) "$$i$(LIBEXT)" "$$dylib"; \
+	    dylib="$(srcdir)/$@/Contents/MacOS/modules/`basename $$i$(LIBEXT)`"; \
+	    $(INSTALL) "`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" "$$dylib"; \
+	    install_name_tool -change "$(libdir)/libvlc.1.dylib" \
+	        "@executable_path/lib/libvlc.dylib" "$$dylib"; \
 	    $(FIXEXECPATH) ; \
 	  fi ; \
 	done
 	if test -d $(top_srcdir)/extras/contrib/vlc-lib; then \
-	  $(INSTALL) -d "./$@/Contents/MacOS/lib"; \
 	  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
-	if test -d "$(MOZILLA_SDK_PATH)/lib"; then \
-	  for i in "$(MOZILLA_SDK_PATH)"/lib/*.dylib ; do \
-	    dylib="./$@/Contents/MacOS/`basename $${i}`" ; \
+	    dylib="$(srcdir)/$@/Contents/MacOS/lib/`basename $${i}`" ; \
 	    $(INSTALL) -m 644 "$${i}" "$$dylib" ; \
 	    $(FIXEXECPATH); \
 	  done ; \
 	fi
+# 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 \
+#	    dylib="$(srcdir)/$@/Contents/MacOS/`basename $${i}`" ; \
+#	    $(INSTALL) -m 644 "$${i}" "$$dylib" ; \
+#	    $(FIXEXECPATH); \
+#	  done ; \
+#	fi
 
 else
 
-LIBRARIES_libvlc = $(LIBRARIES_libvlc_pic)
+#
+# UNIX/Others platforms
+#
+
+npvlc_LTLIBRARIES = libvlcplugin.la
+
 npvlc = libvlcplugin$(LIBEXT)
 npvlcdir = $(libdir)/mozilla/plugins
 SOURCES_support = support/npunix.c
-noinst_DATA =
-
-LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc)
-endif
-endif
-
-noinst_LIBRARIES_mozilla = libnpvlc.a
-
-$(SOURCES_mozilla): vlcintf.h
-
-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) $(XPIDL_INCL) \
-	  -m typelib -o vlcintf $(srcdir)/vlcintf.idl
-
-vlcintf.h: vlcintf.idl
-	$(XPIDL) $(XPIDL_INCL) \
-	  -m header -o vlcintf $(srcdir)/vlcintf.idl
-
-###############################################################################
-# Stamp rules
-###############################################################################
-stamp-pic:
-	@for dep in "" `$(VLC_CONFIG) --target builtin $(pic)`; do \
-	  if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \
-	    rm -f $@; \
-	    break; \
-	  fi; \
-	done
-	@if test ! -f $@; then printf "" > $@; fi
+libvlcplugin_la_LDFLAGS = `$(VLC_CONFIG) --ldflags mozilla` -module -avoid-version -shrext $(LIBEXT)
+libvlcplugin_la_LIBADD = $(LIBRARIES_libvlc) `$(VLC_CONFIG) -libs mozilla`
+# automake gets confused by the ../..
+libvlcplugin_la_DEPENDENCIES = $(AM_LIBADD) 
+endif
+endif
+endif
 
-###############################################################################
-# Force rule
-###############################################################################
-.PHONY: stamp-pic