[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37252] trunk/blender/GNUmakefile: avoid cd'ing with the makefile stub

Campbell Barton ideasman42 at gmail.com
Mon Jun 6 18:00:33 CEST 2011


Revision: 37252
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37252
Author:   campbellbarton
Date:     2011-06-06 16:00:32 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
avoid cd'ing with the makefile stub

Modified Paths:
--------------
    trunk/blender/GNUmakefile

Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile	2011-06-06 15:47:22 UTC (rev 37251)
+++ trunk/blender/GNUmakefile	2011-06-06 16:00:32 UTC (rev 37252)
@@ -64,21 +64,19 @@
 
 # Build Blender
 all:
-	@echo 
+	@echo
 	@echo Configuring Blender ...
 
 	if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
-		mkdir -p $(BUILD_DIR) ; \
-		cd $(BUILD_DIR) ; \
-		cmake $(BLENDER_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
+		cmake -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
 	fi
 
-	@echo 
+	@echo
 	@echo Building Blender ...
-	cd $(BUILD_DIR) ; make -s -j $(NPROCS) install
-	@echo 
+	make -C $(BUILD_DIR) -s -j $(NPROCS) install
+	@echo
 	@echo run blender from "$(BUILD_DIR)/bin/blender"
-	@echo 
+	@echo
 
 debug: all
 	# pass
@@ -91,7 +89,7 @@
 	cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot
 
 package_archive:
-	cd $(BUILD_DIR) ; make -s package_archive
+	make -C $(BUILD_DIR) -s package_archive
 	@echo archive in "$(BUILD_DIR)/release"
 
 # forward build targets
@@ -109,6 +107,6 @@
 	@echo "written: test_cmake_consistency.log"
 
 clean:
-	cd $(BUILD_DIR) ; make clean
+	make -C $(BUILD_DIR) clean
 
 .PHONY: all




More information about the Bf-blender-cvs mailing list