diff options
| author | konablend <[email protected]> | 2013-02-19 22:49:15 +0000 |
|---|---|---|
| committer | konablend <[email protected]> | 2013-02-19 22:49:15 +0000 |
| commit | 7c9d9447537ab753b5e414f5236f2f55f1b56740 (patch) | |
| tree | 54b1018b7bdd58cc4a54f50aa2f6a171cf5dde72 | |
| parent | 1e051449c1a2971e7a4d2c7cf73aeddfb3fbbe38 (diff) | |
cleanup build system settings for several modules
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5257 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/bzip2/module.defs | 6 | ||||
| -rw-r--r-- | contrib/libdvdnav/module.defs | 6 | ||||
| -rw-r--r-- | contrib/mp4v2/module.defs | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/contrib/bzip2/module.defs b/contrib/bzip2/module.defs index 728e28189..0a7463e20 100644 --- 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 6f596d409..473a76237 100644 --- 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 0254d43ff..39aa2233d 100644 --- 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 |