[vlc-devel] [PATCH 2/2] contrib: enable debug for all contribs in non optimized/debug builds

[Steve Lhomme]

---
 contrib/src/main.mak       | 5 +++++
 contrib/src/upnp/rules.mak | 3 ---
 contrib/src/vpx/rules.mak  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index c4ab46d..c61ee0a 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -303,6 +303,11 @@ else
 HOSTCONF += --with-pic
 PIC := -fPIC
 endif
+ifdef WITH_OPTIMIZATION
+HOSTCONF += --disable-dependency-tracking
+else
+HOSTCONF += --enable-debug
+endif
 
 HOSTTOOLS := \
 	CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \
diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index f62f008..2377204 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -20,9 +20,6 @@ CONFIGURE_ARGS=--disable-ipv6 --enable-unspecified_server
 else
 CONFIGURE_ARGS=--enable-ipv6
 endif
-ifndef WITH_OPTIMIZATION
-CONFIGURE_ARGS += --enable-debug
-endif
 
 upnp: libupnp-$(UPNP_VERSION).tar.bz2 .sum-upnp
 	$(UNPACK)
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index adb550e..df52a9c 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -116,7 +116,7 @@ VPX_CONF += --libc=$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLATFORM_SHORT
 endif
 
 ifndef WITH_OPTIMIZATION
-VPX_CONF += --enable-debug --disable-optimizations
+VPX_CONF += --disable-optimizations
 endif
 
 .vpx: libvpx
-- 
2.8.2