Add m2ts and mts to the interface dialog selectors.

[vlc] / projects / mozilla / Makefile.am

diff --git a/projects/mozilla/Makefile.am b/projects/mozilla/Makefile.am
index e17431ad082731146466bb6a430bdcdced75e090..1cac82272cd019d29bcbadb50b2c7996120e62ff 100644 (file)
--- a/projects/mozilla/Makefile.am
+++ b/projects/mozilla/Makefile.am
@@ -12,8 +12,6 @@ SOURCES_mozilla_common = \
        vlcplugin.h \
        control/npolibvlc.cpp \
        control/npolibvlc.h \
-       control/npovlc.cpp \
-       control/npovlc.h \
        control/nporuntime.cpp \
        control/nporuntime.h \
        support/classinfo.h
@@ -23,8 +21,8 @@ DIST_sources = $(SOURCES_mozilla_common) \
 
 if BUILD_MOZILLA
 
-LIBRARIES_libvlc = $(top_builddir)/src/libvlc-control.la \
-                                  $(top_builddir)/src/libvlc.la
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.la \
+                                  $(top_builddir)/src/libvlccore.la
 
 if HAVE_WIN32
 
@@ -94,7 +92,7 @@ npvlc.rsrc: $(srcdir)/vlc.r
 # 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
+# it is safer to force dylibs to locate dependents through a fixed path
 #
 define FIXEXECPATH
        otool -L "$$dylib" | \
@@ -111,33 +109,35 @@ VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES)
        $(INSTALL) -d "$@/Contents/MacOS/lib"
        $(INSTALL) ".libs/npvlc.dylib" "$@/Contents/MacOS/VLC Plugin"
        $(INSTALL) -d "$(srcdir)/$@/Contents/MacOS/lib"; \
-       install_name_tool -change "$(libdir)/libvlc.1.dylib" \
-           "@executable_path/lib/libvlc.dylib" \
+       install_name_tool -change "$(libdir)/libvlccore.0.dylib" \
+           "@executable_path/lib/libvlccore.dylib" \
            "$@/Contents/MacOS/VLC Plugin"
-       install_name_tool -change "$(libdir)/libvlc-control.1.dylib" \
-           "@executable_path/lib/libvlc-control.dylib" \
+       install_name_tool -change "$(libdir)/libvlc.2.dylib" \
+           "@executable_path/lib/libvlc.dylib" \
            "$@/Contents/MacOS/VLC Plugin"
-       $(INSTALL) "$(top_builddir)/src/.libs/libvlc.1.dylib" \
+       $(INSTALL) "$(top_builddir)/src/.libs/libvlccore.0.dylib" \
+           "$@/Contents/MacOS/lib/libvlccore.dylib"
+       $(INSTALL) "$(top_builddir)/src/.libs/libvlc.2.dylib" \
+           "$@/Contents/MacOS/lib/libvlc.dylib"
+       install_name_tool -change "$(libdir)/libvlccore.0.dylib" \
+           "@executable_path/lib/libvlccore.dylib" \
            "$@/Contents/MacOS/lib/libvlc.dylib"
-       $(INSTALL) "$(top_builddir)/src/.libs/libvlc-control.1.dylib" \
-           "$@/Contents/MacOS/lib/libvlc-control.dylib"
-       install_name_tool -change "$(libdir)/libvlc.1.dylib" \
-           "@executable_path/lib/libvlc.dylib" \
-           "$@/Contents/MacOS/lib/libvlc-control.dylib"
        dylib="$@/Contents/MacOS/VLC Plugin"; $(FIXEXECPATH) ;
+       dylib="$@/Contents/MacOS/lib/libvlccore.dylib"; $(FIXEXECPATH) ;
        dylib="$@/Contents/MacOS/lib/libvlc.dylib"; $(FIXEXECPATH) ;
-       dylib="$@/Contents/MacOS/lib/libvlc-control.dylib"; $(FIXEXECPATH) ;
        $(INSTALL) -d "$@/Contents/Resources"
        $(INSTALL) npvlc.rsrc "$@/Contents/Resources/VLC Plugin.rsrc"
        cp -r "$(top_srcdir)/extras/package/macosx/plugin/English.lproj" "$@/Contents/Resources/"
-       $(INSTALL) "$(top_srcdir)/extras/package/macosx/plugin/Info.plist" "$@/Contents/Info.plist"
+       cp -r "$(top_builddir)/extras/package/macosx/plugin/English.lproj" "$@/Contents/Resources/"
+       $(INSTALL) "$(top_builddir)/extras/package/macosx/plugin/Info.plist" "$@/Contents/Info.plist"
        $(INSTALL) -d "$@/Contents/MacOS/modules"
-       for i in "" `$(VLC_CONFIG) --target plugin` ; do \
+       find $(top_srcdir)/modules/ -name '*_plugin.$(LIBEXT)' | \
+       while read i; do \
          if test -n "$$i" ; then \
-           dylib="$@/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"; \
+           dylib="$@/Contents/MacOS/modules/`basename $$i`"; \
+           $(INSTALL) "$$i" "$$dylib"; \
+           install_name_tool -change "$(libdir)/libvlccore.0.dylib" \
+               "@executable_path/lib/libvlccore.dylib" "$$dylib"; \
            $(FIXEXECPATH) ; \
          fi ; \
        done
@@ -163,6 +163,8 @@ else
 # UNIX/Others platforms
 #
 
+CPPFLAGS_mozilla_EXTRA = -DDATA_PATH=\"$(pkgdatadir)\"
+
 npvlc_LTLIBRARIES = libvlcplugin.la
 
 npvlc = libvlcplugin$(LIBEXT)
@@ -170,8 +172,8 @@ npvlcdir = $(libdir)/mozilla/plugins
 SOURCES_support = support/npunix.c
 
 libvlcplugin_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support)
-libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla`
-libvlcplugin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla`
+libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` $(CPPFLAGS_mozilla_EXTRA)
+libvlcplugin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla` $(CPPFLAGS_mozilla_EXTRA)
 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 ../..