X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=make%2Finclude%2Fmain.rules;h=2b288ab3185ea1afa6a118ed1f2f60b480082b35;hb=c593146bf3fab6290c71cbbb974e0a756e43f5e0;hp=f46d223989f5e1c9f9ff209247a186c7f264b0e5;hpb=9f2cfdb81c9b40ea164bc25daca45c77ebe376a6;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/make/include/main.rules b/make/include/main.rules
index f46d2239..2b288ab3 100644
--- a/make/include/main.rules
+++ b/make/include/main.rules
@@ -1,13 +1,26 @@
+.DELETE_ON_ERROR:
+.SUFFIXES:
+
+###############################################################################
+
+## file-wide conditional to use xcode rules if xcode=1 method=terminal
+ifeq ($(FEATURE.xcode):$(BUILD.method),1:terminal)
+    include $(SRC/)macosx/module.xcode
+else
+
 ## only included using special report targets
 ifneq (,$(REPORT))
-    include $(PROJECT/)make/include/report.defs
+    include $(SRC/)make/include/report.defs
 endif
 
 ###############################################################################
 
-.PHONY: clean xclean doc report
+.PHONY: build clean install uninstall xclean doc report
 
+build:
 clean:
+install:
+uninstall:
 xclean: contrib.xclean clean
 doc:
 report:: report.main report.modules
@@ -17,23 +30,27 @@ mrproper: xclean
 
 ###############################################################################
 
-include $(MODULES:%=$(PROJECT/)%/module.rules)
-include $(PROJECT/)make/variant/$(HOST.system).rules
--include $(PROJECT/)make/variant/$(HOST.system).$(BUILD.proc).rules
+include $(SRC/)make/include/base.rules
+
+include $(MODULES:%=$(SRC/)%/module.rules)
+-include $(SRC/)make/variant/$(BUILD.system).rules
+-include $(SRC/)make/variant/$(BUILD.system).$(BUILD.machine).rules
 
 ###############################################################################
 
 ## target which causes re-configure if project-root is svn update'd
-$(BUILD/)GNUmakefile: $(wildcard $(PROJECT/).svn/entries)
-	$(PROJECT/)configure $(CONF.args)
+$(BUILD/)GNUmakefile: $(wildcard $(SRC/).svn/entries)
+	$(SRC/)configure --force $(CONF.args)
 
 ## target useful to force reconfigure; only helpful for build-system development
 .PHONY: reconfigure
 reconfigure:
-	$(PROJECT/)configure $(CONF.args)
+	$(SRC/)configure --force $(CONF.args)
 
 ###############################################################################
 
 ## target to build all dependency dirs
 $(sort $(dir $(BUILD.out))):
 	$(MKDIR.exe) -p $@
+
+endif ## xcode=1 method=terminal