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 \
+ 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
SOURCES_support = support/npwin.cpp
CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
-LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc)
+LDFLAGS_npvlc = -shared -Wl,--kill-at $(LIBRARIES_libvlc)
DATA_npvlc_rc = $(noinst_npvlc_rc_DATA)
+noinst_npvlc_rc_DATA = npvlc_rc.$(OBJEXT)
+noinst_npvlc_rcdir =
+
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/'` \
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
+LDFLAGS_npvlc = -bundle -read_only_relocs suppress \
+ $(LIBRARIES_libvlc) -dylib -headerpad_max_install_names
npvlc.rsrc: $(srcdir)/vlc.r
/Developer/Tools/Rez -useDF /Developer/Headers/FlatCarbon/Types.r $< -o $@
+#
+# Plugin uses shared libraries that are located relatively through @executable_path,
+# which unfortunately references the path of the App using the Plugin, rather than the
+# Plugin itself. Since this Plugin should always be installed in '/Library/Internet Plug-Ins',
+# it is safer to force dylibs to locate dependants through a fixed path
+#
+define FIXEXECPATH
+ otool -L "$$dylib" | \
+ awk -v libdylib="$$dylib" ' \
+ /@executable_path/ { \
+ newpath=$$1 ; \
+ sub("@executable_path","/Library/Internet Plug-Ins/VLC Plugin.plugin/Contents/MacOS",newpath) ; \
+ print "install_name_tool -change \""$$1"\" \""newpath"\" \""libdylib"\"" ; \
+ }' | sh -x
+endef
+
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 -)
+ 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"
+ for i in "" `$(VLC_CONFIG) --target plugin` ; do \
+ if test -n "$$i" ; then \
+ dylib="./$@/Contents/MacOS/modules/`basename $$i$(LIBEXT)`"; \
+ $(INSTALL) "$$i$(LIBEXT)" "$$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
+# 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
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
+
+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
# 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; \
projects / vlc / blobdiff