Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

avoid cd'ing with the makefile stub

Browse Source
This commit is contained in:
Campbell Barton
2011-06-06 16:00:32 +00:00
parent 4d254f23ca
commit 0c1298f972
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
GNUmakefile
View File

@@ -68,14 +68,12 @@ all:
@echo Configuring Blender ... @echo Configuring Blender ...
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \ if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
mkdir -p $(BUILD_DIR) ; \ cmake -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
cd $(BUILD_DIR) ; \
cmake $(BLENDER_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
fi fi
@echo @echo
@echo Building Blender ... @echo Building Blender ...
cd $(BUILD_DIR) ; make -s -j $(NPROCS) install make -C $(BUILD_DIR) -s -j $(NPROCS) install
@echo @echo
@echo run blender from "$(BUILD_DIR)/bin/blender" @echo run blender from "$(BUILD_DIR)/bin/blender"
@echo @echo
@@ -91,7 +89,7 @@ package_pacman:
cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot
package_archive: package_archive:
cd $(BUILD_DIR) ; make -s package_archive make -C $(BUILD_DIR) -s package_archive
@echo archive in "$(BUILD_DIR)/release" @echo archive in "$(BUILD_DIR)/release"
# forward build targets # forward build targets
@@ -109,6 +107,6 @@ test_cmake:
@echo "written: test_cmake_consistency.log" @echo "written: test_cmake_consistency.log"
clean: clean:
cd $(BUILD_DIR) ; make clean make -C $(BUILD_DIR) clean
.PHONY: all .PHONY: all