BuildSystem: general, configure and Xcode updates.

*** NOTICE:
This changeset requires a clean build directory. Please issue 'make xclean' inside
build dir(s) after 'svn up'. This will help ensure there are no unexpected results.

*** GENERAL:
- renamed makevar PROJECT/ -> SRC/ for clarity.
- renamed makevar PREFIX.install/ -> PREFIX/ for clarity.
- split custom GNUmakefile overrides into defs/rules files.
- inserted optional level of make customization at SRC/ level; see docs.
- dropped HB.repo.wcversion (svnversion is no longer used).
- corrected several 'rm' usages to use -f flag which avoids some build errors.
- refreshed generated 00-Building.*.txt docs; work still in progress on the wiki front.

*** CONFIGURE:
- made configure more robust; configure may now be run outside of build directory!
- adding log recording of configure activities.
- improved readability of default options for configure
- added:

    --force             overwrite existing build config
    --src=DIR           specify top-level source dir [.]
    --build=DIR         specify build scratch/output dir [.]
    --prefix=DIR        specify install dir for products [/Applications]

- dropped --launch-force (replaced by --force)
- dropped --launch-dir (replaced by --build)
- dropped --launch-log

*** XCODE:
- renamed pbxproj definition EXTERNAL_PROJECT -> EXTERNAL_SRC for clarity.
- fixed all configurations to default to EXTERNAL_JOBS=1 .
- enabled Xcode internal parallelization (libhb, HandBrakeCLI and HandBrake benefit).
- make now tickles Xcode build files to cause Info.plist regeneration and posting to HandBrake.app output;
  ie: svn up; click build and HandBrake.app's about panel will reflect the new repository rev.

*** DARWIN:
- added support to build universal binaries; see docs.


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

3 files changed, 7 insertions, 5 deletions

diff --git a/contrib/bzip2/module.defs b/contrib/bzip2/module.defs
index bda2a132f..4384f83f7 100644
--- a/contrib/bzip2/module.defs
+++ b/contrib/bzip2/module.defs
@@ -19,7 +19,7 @@ define BZIP2.INSTALL
 endef
 
 define BZIP2.UNINSTALL
-    $(RM.exe) $(CONTRIB.build/)lib/libbz2.a
-    $(RM.exe) $(CONTRIB.build/)include/bzlib.h
+    $(RM.exe) -f $(CONTRIB.build/)lib/libbz2.a
+    $(RM.exe) -f $(CONTRIB.build/)include/bzlib.h
     $(RM.exe) -f $(BZIP2.INSTALL.target)
 endef
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index b41291018..04b060910 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -28,5 +28,5 @@ FFMPEG.CONFIGURE.extra = \
     --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)"
 
 ifeq ($(BUILD.cross),1)
-    FFMPEG.CONFIGURE.extra += --enable-cross-compile --arch=$(FFMPEG.GCC.archs)
+    FFMPEG.CONFIGURE.extra += --enable-cross-compile --arch=$(BUILD.machine)
 endif
diff --git a/contrib/xvidcore/module.defs b/contrib/xvidcore/module.defs
index f25d89d77..dee8b3e45 100644
--- a/contrib/xvidcore/module.defs
+++ b/contrib/xvidcore/module.defs
@@ -9,6 +9,8 @@ XVIDCORE.CONFIGURE.dir = $(XVIDCORE.EXTRACT.dir/)build/generic/
 XVIDCORE.BUILD.dir      = $(XVIDCORE.EXTRACT.dir/)build/generic/
 XVIDCORE.BUILD.ntargets = libxvidcore.a
 
+XVIDCORE.CLEAN.dir      = $(XVIDCORE.EXTRACT.dir/)build/generic/
+
 define XVIDCORE.INSTALL
     $(CP.exe) $(XVIDCORE.EXTRACT.dir/)build/generic/=build/libxvidcore.a $(CONTRIB.build/)lib/
     $(CP.exe) $(XVIDCORE.EXTRACT.dir/)src/xvid.h $(CONTRIB.build/)include/
@@ -16,7 +18,7 @@ define XVIDCORE.INSTALL
 endef
 
 define XVIDCORE.UNINSTALL
-    $(RM.exe) $(CONTRIB.build/)lib/libxvidcore.a
-    $(RM.exe) $(CONTRIB.build/)include/xvid.h
+    $(RM.exe) -f $(CONTRIB.build/)lib/libxvidcore.a
+    $(RM.exe) -f $(CONTRIB.build/)include/xvid.h
     $(RM.exe) -f $(XVIDCORE.INSTALL.target)
 endef