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

diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index 74ed52e5c9..2d69fa4531 100644
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -4,30 +4,27 @@
 
 noinst_LIBRARIES = $(noinst_LIBRARIES_mozilla)
 
-MOSTLYCLEANFILES = $(npvlc_DATA) $(vlcintf_xpt_DATA)
+MOSTLYCLEANFILES = $(npvlc_DATA)
 CLEANFILES = stamp-pic $(BUILT_SOURCES)
-EXTRA_DIST = $(DIST_sources) vlcintf.idl npvlc_rc.rc vlc.r
+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_pic = -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
 
@@ -67,11 +64,11 @@ 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 \
+	-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 \
+LDFLAGS_npvlc = -bundle -read_only_relocs suppress \
 	$(LIBRARIES_libvlc) -dylib -headerpad_max_install_names 
 
 npvlc.rsrc: $(srcdir)/vlc.r
@@ -118,17 +115,18 @@ VLC\ Plugin.plugin: npvlc.rsrc npvlc.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}`" ; \
-	    $(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="./$@/Contents/MacOS/`basename $${i}`" ; \
+#	    $(INSTALL) -m 644 "$${i}" "$$dylib" ; \
+#	    $(FIXEXECPATH); \
+#	  done ; \
+#	fi
 
 else
 
-LIBRARIES_libvlc = $(LIBRARIES_libvlc_pic)
+LIBRARIES_libvlc = -Wl,-rpath '$(libdir)' $(LIBRARIES_libvlc_pic)
 npvlc = libvlcplugin$(LIBEXT)
 npvlcdir = $(libdir)/mozilla/plugins
 SOURCES_support = support/npunix.c
@@ -140,11 +138,6 @@ 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
@@ -154,18 +147,24 @@ EXTRA_LIBRARIES = libnpvlc.a
 endif
 endif
 
+if HAVE_WIN32
+pic =
+else
+pic = pic
+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
+libvlcplugin_la_LDFLAGS = `$(VLC_CONFIG) --libs mozilla` -module -avoid-version -shrext $(LIBEXT)
+libvlcplugin_la_LIBADD = ../src/libvlc-control.la
 
 libnpvlc_a_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support)
-libnpvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla $(pic)` \
+libnpvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \
 	             $(CPPFLAGS_mozilla_EXTRA)
-libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla $(pic)` \
+libnpvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \
 	               $(CPPFLAGS_mozilla_EXTRA)
-LDFLAGS_libnpvlc = $(LDFLAGS_npvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin $(pic)`
+LDFLAGS_libnpvlc = $(LDFLAGS_npvlc) `$(VLC_CONFIG) --libs mozilla libvlc builtin pic`
 libnpvlc_a_DEPENDENCIES = $(DATA_npvlc_rc)
 
 $(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic
@@ -174,20 +173,11 @@ $(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic
 # 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 \
+	@for dep in "" `$(VLC_CONFIG) --target builtin pic`; do \
 	  if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \
 	    rm -f $@; \
 	    break; \