X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=make%2Finclude%2Fmain.rules;h=5a8d8acfba9eb265116b60acb9dcec339901026f;hb=4f0019f03c2e85e8634150ff0c9a31bee6d35ce5;hp=4625ae9db490ddafa776a3bf56d44af96adfc7a7;hpb=0ca72d1de95f3506873ce73ecf46328faa8beb98;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/make/include/main.rules b/make/include/main.rules
index 4625ae9d..5a8d8acf 100644
--- a/make/include/main.rules
+++ b/make/include/main.rules
@@ -4,13 +4,14 @@
 ###############################################################################
 
 ## file-wide conditional to use xcode rules if xcode=1 method=terminal
-ifeq ($(FEATURE.xcode):$(BUILD.method),1:terminal)
-    include $(PROJECT/)macosx/module.xcode
+## 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
 
 ###############################################################################
@@ -20,6 +21,7 @@ endif
 build:
 clean:
 install:
+install-strip:
 uninstall:
 xclean: contrib.xclean clean
 doc:
@@ -30,22 +32,22 @@ mrproper: xclean
 
 ###############################################################################
 
-include $(PROJECT/)make/include/base.rules
+include $(SRC/)make/include/base.rules
 
-include $(MODULES:%=$(PROJECT/)%/module.rules)
--include $(PROJECT/)make/variant/$(HOST.system).rules
--include $(PROJECT/)make/variant/$(HOST.system).$(BUILD.machine).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)
 
 ###############################################################################