move nan mk files from source/ into build_files/make/
authorCampbell Barton <ideasman42@gmail.com>
Tue, 13 Jul 2010 00:57:19 +0000 (00:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 13 Jul 2010 00:57:19 +0000 (00:57 +0000)
Makefile
build_files/make/nan_compile.mk [moved from source/nan_compile.mk with 100% similarity]
build_files/make/nan_definitions.mk [moved from source/nan_definitions.mk with 99% similarity]
build_files/make/nan_link.mk [moved from source/nan_link.mk with 100% similarity]
build_files/make/nan_subdirs.mk [moved from source/nan_subdirs.mk with 100% similarity]
build_files/make/nan_warn.mk [moved from source/nan_warn.mk with 100% similarity]

index 7c883c41741a24374a4a55f7bcf8ffe8aeeaa82b..b16e046d5e858dc41c3335529ea9724c5573bf9c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ sinclude user-def.mk
 # export NAN_NO_OPENAL=true
 
 export NANBLENDERHOME=$(shell pwd)
-MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
+MAKEFLAGS=-I$(NANBLENDERHOME)/build_files/make --no-print-directory
 
 SOURCEDIR = 
 ifeq ($(FREE_WINDOWS),true)
@@ -50,7 +50,7 @@ else
     DIRS ?= extern intern source po
 endif
 
-include source/nan_subdirs.mk
+include build_files/make/nan_subdirs.mk
 
 .PHONY: release
 release:
similarity index 99%
rename from source/nan_definitions.mk
rename to build_files/make/nan_definitions.mk
index 37df7b05467c5a1c111ee380c8707e2de5eeac89..d14bdb0a13cb79f91447b5ac8f3058398fd56e48 100644 (file)
@@ -31,7 +31,7 @@
 # set some defaults when these are not overruled (?=) by environment variables
 #
 
-sinclude ../user-def.mk
+sinclude ../../user-def.mk
 
 # This warning only takes place once in source/
 ifeq (debug, $(findstring debug, $(MAKECMDGOALS)))