From: Pierre d'Herbemont <pdherbemont@free.fr>
Date: Mon, 31 Aug 2009 16:19:50 +0000 (+0200)
Subject: vlc-config: Add a specific flag for libs, and remove werror there.
X-Git-Tag: 1.1.0-ff~3659
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=8cedf34f93a75e2bb4f8a1fc3162b3296cac5a3f

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

diff --git a/libs/loader/Makefile.am b/libs/loader/Makefile.am
index 2e7c7f9397..11a6ab58f4 100644
--- a/libs/loader/Makefile.am
+++ b/libs/loader/Makefile.am
@@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libloader.la
 # TODO: real check for vsscanf() and <sys/mmap.h>
 AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \
 	-DWIN32_PATH=\"\" -DTRACE\(...\)=\(void\)0
-AM_CFLAGS = -fno-PIC `$(top_builddir)/vlc-config --cflags` -U_FILE_OFFSET_BITS \
+AM_CFLAGS = -fno-PIC `$(top_builddir)/vlc-config --cflags libs` -U_FILE_OFFSET_BITS \
 	-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
 
 noinst_HEADERS = com.h driver.h ext.h ldt_keeper.h loader.h registry.h \
diff --git a/vlc-config.in.in b/vlc-config.in.in
index f288da6c04..8d069ab2e4 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -52,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
 }
@@ -96,7 +97,7 @@ cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURC
 #
 if [ "${debug}" = yes ]; then
   cppflags="${cppflags} -DDEBUG"
-  cflags="${cflags} -g ${cflags_werror}"
+  cflags="${cflags} -g"
   cxxflags="${cxxflags} -g"
   objcflags="${objcflags} -g"
   ldflags="${ldflags} -g"
@@ -226,6 +227,10 @@ 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)
@@ -248,6 +253,12 @@ if test -n "${module}"; then
   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
 #