vlc-config: Add a specific flag for libs, and remove werror there.

[vlc] / vlc-config.in.in

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 73f97bb648000859255f024caef52eeba7190d9e..8d069ab2e45959fe53abe9ea9eef92b167d6e316 100644 (file)
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -27,6 +27,8 @@ cflags_optim_speed="@CFLAGS_OPTIM_SPEED@"
 cflags_optim_nodebug="@CFLAGS_OPTIM_NODEBUG@"
 cflags_nooptim="@CFLAGS_NOOPTIM@"
 
+cflags_werror="@CFLAGS_WERROR@"
+
 #
 #  Do not touch below this place unless you really know what you are doing
 #
@@ -50,6 +52,7 @@ Modules:
         builtin                   flags for built-in modules
         pic                       flags for PIC code
         MODULE                    any available module (dummy, gtk, avi, etc.)
+        libs                      flags for external libs
 BLAH
         exit $1
 }
@@ -151,8 +154,9 @@ while test $# -gt 0; do
   # Mangle plugin name, if applicable
   # This is just a convenience hack for modules/common.am
   tgt="$1"
+  tgt="${tgt##*/}"
   case "$tgt" in
-    *lib*_plugin_la-*.lo)
+    lib*_plugin_la-*.lo)
       tgt="${tgt#*lib}"
       tgt="${tgt%_plugin_la-*.lo}"
       ;;
@@ -212,7 +216,7 @@ while test $# -gt 0; do
     -*)
       usage 1 1>&1
       ;;
-    libvlc)
+    libvlccore)
       cppflags="${cppflags} -D__LIBVLC__ -I${top_builddir}src/misc"
       ;;
     plugin)
@@ -223,14 +227,14 @@ while test $# -gt 0; do
       echo_builtin=yes
       cppflags="${cppflags} -D__LIBVLC__ -D__BUILTIN__"
       ;;
+    libs)
+      # Avoid to use werror on what is not vlc's code.
+      cflags_werror=""
+      ;;
     pic)
       ;;
     mozilla)
       ;;
-    external)
-      echo_external=yes
-      libs="${libs} -lvlc -lvlc-control"
-      ;;
     *)
       module="$tgt"
       ;;
@@ -246,23 +250,19 @@ done
 #  If a module was requested, use its name
 #
 if test -n "${module}"; then
-  cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module}"
+  cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module} -DMODULE_STRING=\"${module}\""
 fi
 
+#
+# Set the Werror flags.
+#
+
+cflags="${cflags} ${cflags_werror}"
+
 #
 #  Output what we were asked
 #
 if test "${echo_linkage}" = yes; then
-  if test "${echo_plugin}" = yes; then
-    for module in `echo "${plugins}"`; do
-      register_flags "${module}"
-    done
-  fi
-  if test "${echo_builtin}" = yes; then
-    for module in `echo "${builtins}"`; do
-      register_flags "${module}"
-    done
-  fi
   echo "${linkage}"
   exit 0
 fi
@@ -304,22 +304,10 @@ fi
 # Libs
 # There are 4 possibilities
 #  - We are a plugin or a builtin
-#  - We are building from the outside (external):
-#      - Give full libvlc linkflags + -lvlc (in libdir)
-#      - Link with builtins in libdir
 #  - We are building something from the inside (builtin)
 #       - Link with builtins in place
 #  If you want something shared from the inside (binding),
 #  you need "builtin vlc"
 if test "${echo_libs}" = yes; then
-  if test "${echo_external}" = yes; then
-    for module in `echo "${builtins}"`; do
-      libs="${libs} @libdir@/vlc/lib${module}.a"
-    done
-    for module in `echo "${builtins}"`; do
-      register_flags "${module}"
-    done
-    register_flags "vlc"
-  fi
   echo "${libs}"
 fi