Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit 8cedf34f93a75e2bb4f8a1fc3162b3296cac5a3f 1 parent 769ee59
Pierre d'Herbemont authored August 31, 2009
2  libs/loader/Makefile.am
@@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libloader.la
14 14
 # TODO: real check for vsscanf() and <sys/mmap.h>
15 15
 AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \
16 16
 	-DWIN32_PATH=\"\" -DTRACE\(...\)=\(void\)0
17  
-AM_CFLAGS = -fno-PIC `$(top_builddir)/vlc-config --cflags` -U_FILE_OFFSET_BITS \
  17
+AM_CFLAGS = -fno-PIC `$(top_builddir)/vlc-config --cflags libs` -U_FILE_OFFSET_BITS \
18 18
 	-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
19 19
 
20 20
 noinst_HEADERS = com.h driver.h ext.h ldt_keeper.h loader.h registry.h \
13  vlc-config.in.in
@@ -52,6 +52,7 @@ Modules:
52 52
         builtin                   flags for built-in modules
53 53
         pic                       flags for PIC code
54 54
         MODULE                    any available module (dummy, gtk, avi, etc.)
  55
+        libs                      flags for external libs
55 56
 BLAH
56 57
         exit $1
57 58
 }
@@ -96,7 +97,7 @@ cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURC
96 97
 #
97 98
 if [ "${debug}" = yes ]; then
98 99
   cppflags="${cppflags} -DDEBUG"
99  
-  cflags="${cflags} -g ${cflags_werror}"
  100
+  cflags="${cflags} -g"
100 101
   cxxflags="${cxxflags} -g"
101 102
   objcflags="${objcflags} -g"
102 103
   ldflags="${ldflags} -g"
@@ -226,6 +227,10 @@ while test $# -gt 0; do
226 227
       echo_builtin=yes
227 228
       cppflags="${cppflags} -D__LIBVLC__ -D__BUILTIN__"
228 229
       ;;
  230
+    libs)
  231
+      # Avoid to use werror on what is not vlc's code.
  232
+      cflags_werror=""
  233
+      ;;
229 234
     pic)
230 235
       ;;
231 236
     mozilla)
@@ -249,6 +254,12 @@ if test -n "${module}"; then
249 254
 fi
250 255
 
251 256
 #
  257
+# Set the Werror flags.
  258
+#
  259
+
  260
+cflags="${cflags} ${cflags_werror}"
  261
+
  262
+#
252 263
 #  Output what we were asked
253 264
 #
254 265
 if test "${echo_linkage}" = yes; then

0 notes on commit 8cedf34

Please sign in to comment.
Something went wrong with that request. Please try again.