Changeset 53e6603735235bdc574a4d0d6a6c9450f7e3af84

Timestamp:

15/10/07 18:29:17 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1192465757 +0000

git-parent:

[a83d27a602471a5a4296ab17b5e243135149714c]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1192465757 +0000

Message:

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.

Files:

• Makefile.am (modified) (1 diff)
• activex/Makefile.am (modified) (1 diff)
• modules/genmf (modified) (1 diff)
• mozilla/Makefile.am (modified) (3 diffs)
• src/Makefile.am (modified) (2 diffs)
• vlc-config.in.in (modified) (5 diffs)

Makefile.am

@@ -249 +249 @@
-vlc_DEPENDENCIES = $(DATA_win32_rc)
-
-
-ib
+ `$(VLC_CONFIG) -libs vlc`
+dflag
-if !HAVE_PLUGINS
-vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'`

activex/Makefile.am

@@ -76 +76 @@
-axvlc_la_LDFLAGS = $(srcdir)/axvlc.def -Wl,$(DATA_axvlc_rc) \
-    -no-undefined -avoid-version -module \
-
-
+
+
+
-
-DATA_axvlc_rc = $(noinst_axvlc_rc_DATA)

modules/genmf

@@ -142 +142 @@
-lib${mod}_plugin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\`
-lib${mod}_plugin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\`
-
-
+
+
+
+
+
+
-EOF
-  done

mozilla/Makefile.am

@@ -43 +43 @@
-npvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla` $(CPPFLAGS_mozilla_extra)
-npvlc_la_DEPENDENCIES = $(DATA_npvlc_rc) $(LIBRARIES_libvlc)
-ib
+dflag
-                   $(LDFLAGS_mozilla_EXTRA)
-
+`$(VLC_CONFIG) -libs mozilla` 
-
-DATA_npvlc_rc = $(noinst_npvlc_rc_DATA)
@@ -79 +79 @@
-npvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla` $(CPPFLAGS_mozilla_EXTRA) 
-npvlc_la_DEPENDENCIES = $(LIBRARIES_libvlc)
-ib
+dflag
-                   $(LDFLAGS_mozilla_EXTRA)
-
+
+
-
-noinst_DATA = npvlc.rsrc VLC\ Plugin.plugin
@@ -172 +173 @@
-libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla`
-libvlcplugin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla`
-ib
-
+dflag
+`$(VLC_CONFIG) -libs mozilla` 
-
-endif

src/Makefile.am

@@ -129 +129 @@
-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`
-ib
+dflag
-    -version-info 1:0:0
-if HAVE_COMPILER_EXPORT
@@ -140 +139 @@
-libvlc_la_LDFLAGS += -export-symbols $(srcdir)/libvlc.sym 
-endif
+libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
-
-libvlc_la_DEPENDENCIES = libvlc.sym

vlc-config.in.in

@@ -194 +194 @@
-      echo_objcflags=yes
-      ;;
-
+
+
+
+
-      echo_libs=yes
-      ;;
@@ -217 +220 @@
-    external)
-      echo_external=yes
-dflags="${ldflag
+ibs="${lib
-      ;;      
-    *)
@@ -307 +310 @@
-if test "${echo_objcflags}" = yes; then
-  echo "${cppflags} ${objcflags}"
+fi
+if test "${echo_ldflags}" = yes; then
+  echo "${ldflags}"
-fi
-
@@ -329 +335 @@
-  if test "${echo_external}" = yes; then
-    for module in `echo "${builtins}"`; do
-dflags="${ldflag
+ibs="${lib
-    done
-    for module in `echo "${builtins}"`; do
@@ -336 +342 @@
-    register_flags "vlc"
-  fi
- ${ldflags}
-
+
+