###############################################################################
noinst_LIBRARIES = $(noinst_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)
-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_support) \
- $(NULL)
-
-DIST_rsrc = \
- $(SOURCES_rsrc) \
- $(NULL)
+ vlcruntime.cpp \
+ vlcruntime.h \
+ support/classinfo.h
-DIST_misc = \
- vlcintf.idl \
- $(NULL)
+DIST_sources = $(SOURCES_mozilla_common) \
+ support/npwin.cpp support/npmac.cpp support/npunix.c
if BUILD_SHARED
-LIBRARIES_libvlc_pic = $(top_builddir)/src/libvlc$(LIBEXT)
-LIBRARIES_libvlc_nopic = $(top_builddir)/src/libvlc$(LIBEXT)
+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_pic = $(top_builddir)/src/libvlc.a
LIBRARIES_libvlc_nopic = $(top_builddir)/src/libvlc.a
endif
if HAVE_WIN32
LIBRARIES_libvlc = $(LIBRARIES_libvlc_nopic)
-
-npvlc_DATA = npvlc$(LIBEXT)
+npvlc = npvlc$(LIBEXT)
npvlcdir = $(libdir)
+noinst_DATA = npvlc_rc.$(OBJEXT)
SOURCES_support = support/npwin.cpp
-SOURCES_rsrc = npvlc_rc.rc
CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
+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 = $(libdir)
+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/'` --include-dir $(srcdir) -i $< -o $@
-LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin`
+ $(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
LIBRARIES_libvlc = $(LIBRARIES_libvlc_nopic)
-
-npvlc_DATA = npvlc$(LIBEXT)
+npvlc = npvlc$(LIBEXT)
npvlcdir = $(libdir)
+noinst_DATA = npvlc.rsrc VLC\ Plugin.plugin
+MOSTLYCLEANFILES += npvlc.rsrc
+CLEANFILES += VLC\ Plugin.plugin
-BUNDLE_mozilla = VLC\ Plugin.plugin
SOURCES_support = support/npmac.cpp
-SOURCES_rsrc = vlc.r
-
-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
+CPPFLAGS_mozilla_EXTRA = -I. -I$(top_builddir) -I$(srcdir)/../include -c \
+ -F/System/Library/Frameworks/CoreFoundation.framework $(moz_CFLAGS) \
+ -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 = -bundle -read_only_relocs suppress \
+ $(LIBRARIES_libvlc) -dylib -headerpad_max_install_names
-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 -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)
-noinst_bundle_DATA = VLC\ Plugin.plugin
-noinst_bundledir = $(libdir)
+#
+# 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)
-
-npvlc_DATA = libvlcplugin$(LIBEXT)
+npvlc = libvlcplugin$(LIBEXT)
npvlcdir = $(libdir)/mozilla/plugins
-
SOURCES_support = support/npunix.c
+noinst_DATA =
-LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc) `$(VLC_CONFIG) --libs mozilla vlc builtin $(pic)`
-
+LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc)
endif
endif
noinst_LIBRARIES_mozilla = libnpvlc.a
-libnpvlc_a_SOURCES = $(SOURCES_mozilla)
+$(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 -avoid-version -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)
-BUILT_SOURCES_mozilla = vlcintf.h
-$(SOURCES_mozilla): vlcintf.h
-
-$(npvlc_DATA): $(libnpvlc_a_OBJECTS) \
- $(libnpvlc_a_DEPENDENCIES) stamp-pic
+$(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic
$(CXXLINK) $(libnpvlc_a_OBJECTS) $(DATA_npvlc_rc) \
- $(LDFLAGS_npvlc)
+ $(LDFLAGS_libnpvlc)
+# Cygwin work-around
+ @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
-vlcintf_xpt_DATA = vlcintf.xpt
vlcintf_xptdir = $(libdir)/mozilla/components
vlcintf.xpt: vlcintf.idl
$(XPIDL) $(XPIDL_INCL) \
$(XPIDL) $(XPIDL_INCL) \
-m header -o vlcintf $(srcdir)/vlcintf.idl
-endif
-
###############################################################################
# Stamp rules
###############################################################################
-clean-local: clean-stamp clean-bundle
-
-clean-bundle:
- rm -rf ./VLC\ Plugin.plugin
-
-clean-stamp:
- rm -f stamp-pic
-
-stamp-pic: FORCE
+stamp-pic:
@for dep in "" `$(VLC_CONFIG) --target builtin $(pic)`; do \
if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \
rm -f $@; \
###############################################################################
# Force rule
###############################################################################
-FORCE:
+.PHONY: stamp-pic
projects / vlc / blobdiff