cleanup build system settings for several modules

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5257 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/bzip2/module.defs b/contrib/bzip2/module.defs
index 728e28189cf3dca8a0b18deb8324af71766e6e25..0a7463e20fdc8ef448881b9bc911dc3fbd25f386 100644 (file)
--- a/contrib/bzip2/module.defs
+++ b/contrib/bzip2/module.defs
@@ -6,10 +6,10 @@ BZIP2.EXTRACT.tarbase = bzip2
 BZIP2.CONFIGURE = $(TOUCH.exe) $@
 
 BZIP2.BUILD.extra = \
-    CC=$(BZIP2.GCC.gcc) \
-    CFLAGS="$(call fn.ARGS,BZIP2.GCC,*archs *sysroot *minver)" \
+    PREFIX="$(BZIP2.CONFIGURE.prefix)" \
+    CC="$(BZIP2.GCC.gcc)" \
+    $(BZIP2.CONFIGURE.env.CFLAGS) \
     RANLIB="$(RANLIB.exe)"
-    PREFIX=$(call fn.ABSOLUTE,$(CONTRIB.build/))
 
 BZIP2.BUILD.ntargets = libbz2.a
 

diff --git a/contrib/libdvdnav/module.defs b/contrib/libdvdnav/module.defs
index 6f596d4090f4c1760892f1913ec25527e592c588..473a76237bcf83ae1f749f5f898faa66d02ac6d4 100644 (file)
--- a/contrib/libdvdnav/module.defs
+++ b/contrib/libdvdnav/module.defs
@@ -5,11 +5,7 @@ LIBDVDNAV.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libdvdnav-s
 LIBDVDNAV.EXTRACT.tarbase = libdvdnav
 
 ifneq (max,$(LIBDVDNAV.GCC.g))
-ifeq (none,$(LIBDVDNAV.GCC.O))
-    LIBDVDNAV.CONFIGURE.env.CFLAGS   = CFLAGS="$(call fn.ARGS,LIBDVDNAV.GCC,*sysroot *minver ?extra .O) -DNDEBUG"
-else
-    LIBDVDNAV.CONFIGURE.env.CFLAGS   = CFLAGS="$(call fn.ARGS,LIBDVDNAV.GCC,*sysroot *minver ?extra) -DNDEBUG"
-endif
+    LIBDVDNAV.GCC.D += NDEBUG
 endif
 
 LIBDVDNAV.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; autoreconf -fiv;

diff --git a/contrib/mp4v2/module.defs b/contrib/mp4v2/module.defs
index 0254d43ffe995f77e57fb982afc43c01e50e51f4..39aa2233daf099f2b7f7339313dc045f9adab326 100644 (file)
--- a/contrib/mp4v2/module.defs
+++ b/contrib/mp4v2/module.defs
@@ -4,8 +4,8 @@ $(eval $(call import.CONTRIB.defs,MP4V2))
 MP4V2.FETCH.url = http://download.handbrake.fr/handbrake/contrib/mp4v2-trunk-r355.tar.bz2
 
 ## propagate more flags
-MP4V2.CONFIGURE.env.CFLAGS = CFLAGS="$(call fn.ARGS,MP4V2.GCC,*archs *sysroot *minver *D .g .O)"
-MP4V2.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,MP4V2.GCC,*archs *sysroot *minver *D .g .O)"
+MP4V2.CONFIGURE.env.CFLAGS = CFLAGS="$(call fn.ARGS,MP4V2.GCC,*archs *sysroot *minver ?extra *D .g .O)"
+MP4V2.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,MP4V2.GCC,*archs *sysroot *minver ?extra *D .g .O)"
 
 ## save some build-time by disabling utils
 MP4V2.CONFIGURE.extra += --disable-util