* fixed a corner case on PowerPC-based Macs since MACOSX_DEPLOYMENT_TARGET is set...

[vlc] / mozilla / Makefile.am

diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index e9a57ba8df8051b4ad9f8c51d114230f33ccc425..04a6c87ec22a6da87499211b6f2b2645bfc35375 100644 (file)
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -42,9 +42,9 @@ 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) --libs mozilla` -module -avoid-version \
+npvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags mozilla` -module -avoid-version \
                                   $(LDFLAGS_mozilla_EXTRA)
-npvlc_la_LIBADD = $(LIBRARIES_libvlc)
+npvlc_la_LIBADD = `$(VLC_CONFIG) -libs mozilla` $(LIBRARIES_libvlc)
 
 DATA_npvlc_rc = $(noinst_npvlc_rc_DATA)
 noinst_npvlc_rc_DATA = npvlc_rc.$(OBJEXT)
@@ -71,16 +71,17 @@ CPPFLAGS_mozilla_EXTRA = -I. -I$(top_builddir) -I$(srcdir)/../include -c \
        -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_mozilla_EXTRA = -no-undefined -bundle -read_only_relocs suppress \
-       -dylib -headerpad_max_install_names -shrext $(LIBEXT)
+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) --libs mozilla` -module -avoid-version \
+npvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags mozilla` -module -avoid-version \
                                   $(LDFLAGS_mozilla_EXTRA)
-npvlc_la_LIBADD = $(LIBRARIES_libvlc)
+npvlc_la_LIBADD = `$(VLC_CONFIG) -libs mozilla` $(LIBRARIES_libvlc)
+
 
 noinst_DATA = npvlc.rsrc VLC\ Plugin.plugin
 MOSTLYCLEANFILES += npvlc.rsrc
@@ -107,25 +108,42 @@ endef
 
 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}`" ; \
+           dylib="$(srcdir)/$@/Contents/MacOS/lib/`basename $${i}`" ; \
            $(INSTALL) -m 644 "$${i}" "$$dylib" ; \
            $(FIXEXECPATH); \
          done ; \
@@ -133,7 +151,7 @@ VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES)
 # 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}`" ; \
+#          dylib="$(srcdir)/$@/Contents/MacOS/`basename $${i}`" ; \
 #          $(INSTALL) -m 644 "$${i}" "$$dylib" ; \
 #          $(FIXEXECPATH); \
 #        done ; \
@@ -154,9 +172,10 @@ 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_LDFLAGS = `$(VLC_CONFIG) --libs mozilla` -module -avoid-version -shrext $(LIBEXT)
-libvlcplugin_la_LIBADD = $(LIBRARIES_libvlc)
-
+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