[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39446] trunk/blender/GNUmakefile: turns out recent commit made 'make' on its own fail.

Campbell Barton ideasman42 at gmail.com
Tue Aug 16 15:45:17 CEST 2011


Revision: 39446
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39446
Author:   campbellbarton
Date:     2011-08-16 13:45:17 +0000 (Tue, 16 Aug 2011)
Log Message:
-----------
turns out recent commit made 'make' on its own fail.

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

Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile	2011-08-16 13:10:46 UTC (rev 39445)
+++ trunk/blender/GNUmakefile	2011-08-16 13:45:17 UTC (rev 39446)
@@ -77,7 +77,29 @@
 	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
 endif
 
+# -----------------------------------------------------------------------------
+# Build Blender
+all:
+	@echo
+	@echo Configuring Blender ...
 
+	if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
+		cmake $(BUILD_CMAKE_ARGS) -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE); \
+	fi
+
+	@echo
+	@echo Building Blender ...
+	$(MAKE) -C $(BUILD_DIR) -s -j $(NPROCS) install
+	@echo
+	@echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild.
+	@echo blender installed, run from: "$(BUILD_DIR)/bin/blender"
+	@echo
+
+debug: all
+lite: all
+headless: all
+bpy: all
+
 # -----------------------------------------------------------------------------
 # Helo for build targets
 help:
@@ -105,32 +127,7 @@
 	@echo "  * test_deprecated - checks for deprecation tags in our code which may need to be removed"
 	@echo ""
 
-
 # -----------------------------------------------------------------------------
-# Build Blender
-all:
-	@echo
-	@echo Configuring Blender ...
-
-	if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
-		cmake $(BUILD_CMAKE_ARGS) -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE); \
-	fi
-
-	@echo
-	@echo Building Blender ...
-	$(MAKE) -C $(BUILD_DIR) -s -j $(NPROCS) install
-	@echo
-	@echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild.
-	@echo blender installed, run from: "$(BUILD_DIR)/bin/blender"
-	@echo
-
-debug: all
-lite: all
-headless: all
-bpy: all
-
-
-# -----------------------------------------------------------------------------
 # Packages
 #
 package_debian:




More information about the Bf-blender-cvs mailing list