BuildSystem:

- fixed OSX + Xcode to support parallel builds
- enhanced OSX + Xcode to use proper pass-thru for all make targets
- added global target --> install
- added install: test.install
- added install: gtk.install
- updated pre-generated building guides (these will go away when wiki is updated)
- updated xml2wiki script to spit out heading


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

4 files changed, 33 insertions, 26 deletions

diff --git a/make/include/base.defs b/make/include/base.defs
index 3b4e666f3..4e6da0e64 100644
--- a/make/include/base.defs
+++ b/make/include/base.defs
@@ -24,6 +24,8 @@ endef
 ## $(1) module name (uppercase)
 ##
 define import.MODULE.rules
+.PHONY: $($(1).name).build $($(1).name).clean 
+
 $($(1).name).report:
 	@$(MAKE) report.true REPORT=module REPORT.module=$(1)
 
@@ -31,20 +33,3 @@ $($(1).name).report:
 report.modules:: $($(1).name).report
 
 endef
-
-.PHONY: report.main report.gcc report.modules
-
-report.modules::
-
-.PHONY: report.main
-report.main:
-	@$(MAKE) report.true REPORT=main
-
-.PHONY: report.gcc
-report.gcc:
-	@$(MAKE) report.true REPORT=gcc
-
-## needed for nested make (which drives each report)
-.PHONY: report.true
-report.true:
-	@true
diff --git a/make/include/base.rules b/make/include/base.rules
new file mode 100644
index 000000000..f12886432
--- /dev/null
+++ b/make/include/base.rules
@@ -0,0 +1,16 @@
+.PHONY: report.main report.gcc report.modules
+
+report.modules::
+
+.PHONY: report.main
+report.main:
+	@$(MAKE) report.true REPORT=main
+
+.PHONY: report.gcc
+report.gcc:
+	@$(MAKE) report.true REPORT=gcc
+
+## needed for nested make (which drives each report)
+.PHONY: report.true
+report.true:
+	@true
diff --git a/make/include/main.defs b/make/include/main.defs
index 45fb178ae..93271a365 100644
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -1,11 +1,3 @@
-.DELETE_ON_ERROR:
-.SUFFIXES:
-
-.PHONY: build
-build:
-
-###############################################################################
-
 include $(PROJECT/)make/include/base.defs
 include $(PROJECT/)make/include/contrib.defs
 include $(PROJECT/)make/include/function.defs
diff --git a/make/include/main.rules b/make/include/main.rules
index b389022f3..1f996cdc5 100644
--- a/make/include/main.rules
+++ b/make/include/main.rules
@@ -1,3 +1,13 @@
+.DELETE_ON_ERROR:
+.SUFFIXES:
+
+###############################################################################
+
+## file-wide conditional to use xcode rules if xcode=1 method=terminal
+ifeq ($(FEATURE.xcode):$(BUILD.method),1:terminal)
+    include $(PROJECT/)macosx/module.xcode
+else
+
 ## only included using special report targets
 ifneq (,$(REPORT))
     include $(PROJECT/)make/include/report.defs
@@ -5,8 +15,10 @@ endif
 
 ###############################################################################
 
-.PHONY: clean xclean doc report
+.PHONY: build install clean xclean doc report
 
+build:
+install:
 clean:
 xclean: contrib.xclean clean
 doc:
@@ -37,3 +49,5 @@ reconfigure:
 ## target to build all dependency dirs
 $(sort $(dir $(BUILD.out))):
 	$(MKDIR.exe) -p $@
+
+endif ## xcode=1 method=terminal