diff options
| author | konablend <[email protected]> | 2009-03-05 06:57:31 +0000 |
|---|---|---|
| committer | konablend <[email protected]> | 2009-03-05 06:57:31 +0000 |
| commit | d9cbd469c2cda62f205599173910ec627031dadd (patch) | |
| tree | 188532861f51a1650a643e426501c2dc257fd536 /contrib | |
| parent | 66672c6931393a17a4ffc48c1509205d23518221 (diff) | |
BuildSystem:
- increased inter-contrib module rebuild sanity;
ie: if an svn update is done and a new x264 tarball is available, the system will fetch
it and proceed to extract->patch->configure->build->install and because it is utterly
dangerous (undefined results can easily occur) to re-extract over an existing extract,
the appropriate steps are taken to first rm -fr the tarball extraction directory.
This is generally good practice but I'm explaining it here in detail in case some
developers are taking risks like editing files in the build/ tree and erroneously
assuming they will not be overwritten by either this new build system or contrib
(foreign) build systems.
- added contrib touch/untouch targets; see doc.
- updated docs accordingly.
- fixed typo for GCCargs.g.max which caused --debug=max to not operate properly.
- unofficial builds will no longer rebrand naming to 'NoNameBrand'
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2223 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/bzip2/module.defs | 6 | ||||
| -rw-r--r-- | contrib/xvidcore/module.defs | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/contrib/bzip2/module.defs b/contrib/bzip2/module.defs index dcc878ad4..83107cfdc 100644 --- a/contrib/bzip2/module.defs +++ b/contrib/bzip2/module.defs @@ -14,11 +14,13 @@ BZIP2.BUILD.ntargets = libbz2.a define BZIP2.INSTALL mkdir -p $(CONTRIB.build/)lib/ $(CONTRIB.build/)include/ - cp $(BZIP2.EXTRACT.target/)libbz2.a $(CONTRIB.build/)lib/ - cp $(BZIP2.EXTRACT.target/)bzlib.h $(CONTRIB.build/)include/ + cp $(BZIP2.EXTRACT.dir/)libbz2.a $(CONTRIB.build/)lib/ + cp $(BZIP2.EXTRACT.dir/)bzlib.h $(CONTRIB.build/)include/ + $(TOUCH.exe) $@ endef define BZIP2.UNINSTALL rm $(CONTRIB.build/)lib/libbz2.a rm $(CONTRIB.build/)include/bzlib.h + $(RM.exe) -f $(BZIP2.INSTALL.target) endef diff --git a/contrib/xvidcore/module.defs b/contrib/xvidcore/module.defs index 0ec291a24..c45059b23 100644 --- a/contrib/xvidcore/module.defs +++ b/contrib/xvidcore/module.defs @@ -4,17 +4,19 @@ $(eval $(call import.CONTRIB.defs,XVIDCORE)) XVIDCORE.FETCH.url = http://download.m0k.org/handbrake/contrib/xvidcore-1.1.3.tar.gz XVIDCORE.EXTRACT.tarbase = xvidcore -XVIDCORE.CONFIGURE.dir = $(XVIDCORE.EXTRACT.target/)build/generic/ +XVIDCORE.CONFIGURE.dir = $(XVIDCORE.EXTRACT.dir/)build/generic/ -XVIDCORE.BUILD.dir = $(XVIDCORE.EXTRACT.target/)build/generic/ +XVIDCORE.BUILD.dir = $(XVIDCORE.EXTRACT.dir/)build/generic/ XVIDCORE.BUILD.ntargets = libxvidcore.a define XVIDCORE.INSTALL - cp $(XVIDCORE.EXTRACT.target/)build/generic/=build/libxvidcore.a $(CONTRIB.build/)lib/ - cp $(XVIDCORE.EXTRACT.target/)src/xvid.h $(CONTRIB.build/)include/ + cp $(XVIDCORE.EXTRACT.dir/)build/generic/=build/libxvidcore.a $(CONTRIB.build/)lib/ + cp $(XVIDCORE.EXTRACT.dir/)src/xvid.h $(CONTRIB.build/)include/ + $(TOUCH.exe) $@ endef define XVIDCORE.UNINSTALL rm $(CONTRIB.build/)lib/libxvidcore.a rm $(CONTRIB.build/)include/xvid.h + $(RM.exe) -f $(XVIDCORE.INSTALL.target) endef |