turns out recent commit made 'make' on its own fail.
authorCampbell Barton <ideasman42@gmail.com>
Tue, 16 Aug 2011 13:45:17 +0000 (13:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 16 Aug 2011 13:45:17 +0000 (13:45 +0000)
GNUmakefile

index 4aaa77ee52df788ac4c9354c27e1f22dc9d0d9a7..8446541cfae3db1af0f13f0e213dd7560ca197bc 100644 (file)
@@ -77,6 +77,28 @@ ifeq ($(OS), NetBSD)
        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
@@ -105,31 +127,6 @@ help:
        @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
 #