Commit 8cedf34f authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

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

parent 769ee590
...@@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libloader.la ...@@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libloader.la
# TODO: real check for vsscanf() and <sys/mmap.h> # TODO: real check for vsscanf() and <sys/mmap.h>
AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \ AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \
-DWIN32_PATH=\"\" -DTRACE\(...\)=\(void\)0 -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 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
noinst_HEADERS = com.h driver.h ext.h ldt_keeper.h loader.h registry.h \ noinst_HEADERS = com.h driver.h ext.h ldt_keeper.h loader.h registry.h \
......
...@@ -52,6 +52,7 @@ Modules: ...@@ -52,6 +52,7 @@ Modules:
builtin flags for built-in modules builtin flags for built-in modules
pic flags for PIC code pic flags for PIC code
MODULE any available module (dummy, gtk, avi, etc.) MODULE any available module (dummy, gtk, avi, etc.)
libs flags for external libs
BLAH BLAH
exit $1 exit $1
} }
...@@ -96,7 +97,7 @@ cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURC ...@@ -96,7 +97,7 @@ cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURC
# #
if [ "${debug}" = yes ]; then if [ "${debug}" = yes ]; then
cppflags="${cppflags} -DDEBUG" cppflags="${cppflags} -DDEBUG"
cflags="${cflags} -g ${cflags_werror}" cflags="${cflags} -g"
cxxflags="${cxxflags} -g" cxxflags="${cxxflags} -g"
objcflags="${objcflags} -g" objcflags="${objcflags} -g"
ldflags="${ldflags} -g" ldflags="${ldflags} -g"
...@@ -226,6 +227,10 @@ while test $# -gt 0; do ...@@ -226,6 +227,10 @@ while test $# -gt 0; do
echo_builtin=yes echo_builtin=yes
cppflags="${cppflags} -D__LIBVLC__ -D__BUILTIN__" cppflags="${cppflags} -D__LIBVLC__ -D__BUILTIN__"
;; ;;
libs)
# Avoid to use werror on what is not vlc's code.
cflags_werror=""
;;
pic) pic)
;; ;;
mozilla) mozilla)
...@@ -248,6 +253,12 @@ if test -n "${module}"; then ...@@ -248,6 +253,12 @@ if test -n "${module}"; then
cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module} -DMODULE_STRING=\"${module}\"" cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module} -DMODULE_STRING=\"${module}\""
fi fi
#
# Set the Werror flags.
#
cflags="${cflags} ${cflags_werror}"
# #
# Output what we were asked # Output what we were asked
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment