X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=make%2Finclude%2Fmain.rules;h=132567c1e965d10caee3486923312c11d7165f4e;hb=240cf3308bf21be4d1918a71a5510d07e7d6d85b;hp=b389022f38d7d1c10ca847b3e6066d62dc523c1b;hpb=af6e38497ead864fdcd03319c9fc70d976205289;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/make/include/main.rules b/make/include/main.rules
index b389022f..132567c1 100644
--- a/make/include/main.rules
+++ b/make/include/main.rules
@@ -1,13 +1,27 @@
+.DELETE_ON_ERROR:
+.SUFFIXES:
+
+###############################################################################
+
+## file-wide conditional to use xcode rules if xcode=1 method=terminal
+## xcodemake will set BUILD.method != terminal to prevent infinite recursion
+ifeq (1:terminal,$(FEATURE.xcode):$(BUILD.method))
+    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 +31,27 @@ mrproper: xclean
 
 ###############################################################################
 
-include $(MODULES:%=$(PROJECT/)%/module.rules)
--include $(PROJECT/)make/variant/$(HOST.system).rules
--include $(PROJECT/)make/variant/$(HOST.system).$(BUILD.machine).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-method=$(CONF.method) $(CONF.args)
 
 ## target useful to force reconfigure; only helpful for build-system development
 .PHONY: reconfigure
 reconfigure:
-	$(PROJECT/)configure $(CONF.args)
+	$(SRC/)configure --force --conf-method=$(CONF.method) $(CONF.args)
 
 ###############################################################################
 
 ## target to build all dependency dirs
 $(sort $(dir $(BUILD.out))):
 	$(MKDIR.exe) -p $@
+
+endif ## xcode=1 method=terminal