summaryrefslogtreecommitdiffstats
path: root/make/include/main.rules
diff options
context:
space:
mode:
authorkonablend <[email protected]>2009-03-03 02:49:54 +0000
committerkonablend <[email protected]>2009-03-03 02:49:54 +0000
commit55afb374694267dd7209afd2ec279e8f51154bcf (patch)
tree8d56c354b0998d39fc0c992b1abd24753a4c46eb /make/include/main.rules
parent0a6c39fcd2f352d0413298274efab13056fd429a (diff)
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
Diffstat (limited to 'make/include/main.rules')
-rw-r--r--make/include/main.rules16
1 files changed, 15 insertions, 1 deletions
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