X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc-config.in.in;h=8d069ab2e45959fe53abe9ea9eef92b167d6e316;hb=8cedf34f93a75e2bb4f8a1fc3162b3296cac5a3f;hp=b4305b510c500f8fc826872b009252f6b6a71373;hpb=1be45fb5f915358d51d81ac43d974a8c71e7b164;p=vlc

diff --git a/vlc-config.in.in b/vlc-config.in.in
index b4305b510c..8d069ab2e4 100644
--- 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
 }
@@ -213,7 +216,7 @@ while test $# -gt 0; do
     -*)
       usage 1 1>&1
       ;;
-    libvlc)
+    libvlccore)
       cppflags="${cppflags} -D__LIBVLC__ -I${top_builddir}src/misc"
       ;;
     plugin)
@@ -224,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"
       ;;
@@ -247,9 +250,15 @@ 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
 #
@@ -295,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