Separate LDFLAGS from LIBS for real.

Should fix problems with building libvlc.so.1 when libvlc.so.0 is installed.
Cannot test since the tree is currently broken.

diff --git a/Makefile.am b/Makefile.am
index a3dc56ee1ace7e5c59f48fd873b0ed73c3218fb2..6b7ef7427b5eada4708d7341630005db0c8ea1aa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -248,8 +248,8 @@ nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m
 
 vlc_DEPENDENCIES = $(DATA_win32_rc)
 
-vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL)
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
+vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc`
+vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
 if !HAVE_PLUGINS
 vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'`
 endif

diff --git a/activex/Makefile.am b/activex/Makefile.am
index cbfae4c10b659c753bb428ab9aee5767eeb34356..da258cca41403919b749fd57701812058124e6d4 100644 (file)
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -75,8 +75,9 @@ axvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags activex`
 axvlc_la_DEPENDENCIES = axvlc.def $(DATA_axvlc_rc) $(LIBRARIES_libvlc)
 axvlc_la_LDFLAGS = $(srcdir)/axvlc.def -Wl,$(DATA_axvlc_rc) \
     -no-undefined -avoid-version -module \
-    `$(VLC_CONFIG) --libs activex libvlc`
-axvlc_la_LIBADD = $(LIBRARIES_libvlc)
+    `$(VLC_CONFIG) --ldflags activex libvlc`
+axvlc_la_LIBADD = $(LIBRARIES_libvlc) \
+       `$(VLC_CONFIG) -libs activex`
 
 DATA_axvlc_rc = $(noinst_axvlc_rc_DATA)
 noinst_axvlc_rc_DATA = axvlc_rc.$(OBJEXT)

diff --git a/modules/genmf b/modules/genmf
index bcb7d400419780bf003090335643c5a46d5afdae..9d79c132591b03f0a20a196eb7f253ec87845e5f 100755 (executable)
--- a/modules/genmf
+++ b/modules/genmf
@@ -141,8 +141,12 @@ EOF
 lib${mod}_plugin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\`
 lib${mod}_plugin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\`
 lib${mod}_plugin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\`
-lib${mod}_plugin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs plugin ${mod}\` \$(AM_LDFLAGS)
-lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD)
+lib${mod}_plugin_la_LDFLAGS = \$(AM_LDFLAGS) \\
+       \`\$(VLC_CONFIG) --ldflags plugin ${mod}\`
+lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD) \\
+       \`\$(VLC_CONFIG) -libs plugin ${mod}\` 
+# Automake does not understand \`...\` very well inside LIBADD...
+lib${mod}_plugin_la_DEPENDENCIES = \$(AM_LIBADD)
 EOF
   done
 

diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index 19bd43d863c8e8e00baa2b84460213d00ca7f400..d72c038ccccac1fcbff10b43270cd2ca00a01d98 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)
@@ -78,9 +78,10 @@ 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
@@ -171,8 +172,8 @@ 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 = `$(VLC_CONFIG) -libs mozilla` $(LIBRARIES_libvlc)
 
 endif
 endif

diff --git a/src/Makefile.am b/src/Makefile.am
index 14ba5fd8483769d16f3c9eb8882cde6045c31ba5..d35d643fecd389a36d04ebe051e6494808178807 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -128,17 +128,17 @@ endif
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
 nodist_libvlc_la_SOURCES = misc/revision.c
-libvlc_la_LIBADD = $(LTLIBINTL)
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
-libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs libvlc` $(AM_LDFLAGS) \
+libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
        -version-info 1:0:0
 if HAVE_COMPILER_EXPORT
 libvlc_la_LDFLAGS += -export-dynamic
 else
 libvlc_la_LDFLAGS += -export-symbols $(srcdir)/libvlc.sym 
 endif
+libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
 
 libvlc_la_DEPENDENCIES = libvlc.sym
 

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 4649ed31fa793149bf4e296268efbd1f8ce00d55..ae1056dcde5f63b57c89fe4e6bcb773ff461aa92 100644 (file)
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -193,7 +193,10 @@ while test $# -gt 0; do
     --objcflags)
       echo_objcflags=yes
       ;;
-    --libs)
+    --ldflags)
+      echo_ldflags=yes
+      ;;
+    --libs|-libs)
       echo_libs=yes
       ;;
     -*)
@@ -216,7 +219,7 @@ while test $# -gt 0; do
       ;;
     external)
       echo_external=yes
-      ldflags="${ldflags} -lvlc -lvlc-control"
+      libs="${libs} -lvlc -lvlc-control"
       ;;      
     *)
       module="$1"
@@ -307,6 +310,9 @@ fi
 if test "${echo_objcflags}" = yes; then
   echo "${cppflags} ${objcflags}"
 fi
+if test "${echo_ldflags}" = yes; then
+  echo "${ldflags}"
+fi
 
 # Libs
 # There are 4 possibilities
@@ -328,12 +334,12 @@ if test "${echo_libs}" = yes; then
   fi
   if test "${echo_external}" = yes; then
     for module in `echo "${builtins}"`; do
-      ldflags="${ldflags} @libdir@/vlc/lib${module}.a"
+      libs="${libs} @libdir@/vlc/lib${module}.a"
     done
     for module in `echo "${builtins}"`; do
       register_flags "${module}"
     done
     register_flags "vlc"
   fi
-  echo "${libs} ${ldflags}"
+  echo "${libs}"
 fi