From 083ba4898a662cd50a86d2a65ca5ebe765fe882d Mon Sep 17 00:00:00 2001
From: konablend <kona8lend@gmail.com>
Date: Sun, 8 Mar 2009 22:50:57 +0000
Subject: 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
---
 gtk/module.defs  | 2 +-
 gtk/module.rules | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'gtk')

diff --git a/gtk/module.defs b/gtk/module.defs
index ed46be53b..7550a82ae 100644
--- a/gtk/module.defs
+++ b/gtk/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,GTK,gtk,LIBHB))
 $(eval $(call import.GCC,GTK))
 
-GTK.src/   = $(PROJECT/)gtk/
+GTK.src/   = $(SRC/)gtk/
 GTK.build/ = $(BUILD/)gtk/
 
 GTK.CONFIGURE.stamp = $(GTK.build/).stamp.configure
diff --git a/gtk/module.rules b/gtk/module.rules
index f66bbbb60..c2800785a 100644
--- a/gtk/module.rules
+++ b/gtk/module.rules
@@ -14,7 +14,7 @@ $(GTK.CONFIGURE.stamp): | $(dir $(GTK.CONFIGURE.stamp))
 		PKG_CONFIG_DIR=$(BUILD/)contrib/lib/pkgconfig \
 	    CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O)" \
 	    LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O)" \
-	    --prefix=$(INSTALL.prefix) \
+	    --prefix=$(PREFIX) \
 	    --with-hb=$(call fn.ABSOLUTE,$(BUILD/))
 	$(TOUCH.exe) $@
 
-- 
cgit v1.2.3