Added setting of the variables for header and jamfile cache files and moved BuildConfig into build/.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2026 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -26,16 +26,24 @@ if ! $(INVOCATION_SUBDIR_SET) {
|
|||||||
|
|
||||||
} # vanilla Jam compatibility
|
} # vanilla Jam compatibility
|
||||||
|
|
||||||
|
# The directory for build system specific files
|
||||||
|
OBOS_BUILD_DIR = [ FDirName $(OBOS_TOP) build ] ;
|
||||||
|
|
||||||
|
# Cache files for header scanning and jamfile caching
|
||||||
|
HCACHEFILE = header_cache ;
|
||||||
|
JCACHEFILE = jamfile_cache ;
|
||||||
|
LOCATE on $(HCACHEFILE) $(JCACHEFILE) = $(OBOS_BUILD_DIR) ;
|
||||||
|
|
||||||
# Include BuildConfig
|
# Include BuildConfig
|
||||||
{
|
{
|
||||||
local buildConfig = [ GLOB $(OBOS_TOP) : BuildConfig ] ;
|
local buildConfig = [ GLOB $(OBOS_BUILD_DIR) : BuildConfig ] ;
|
||||||
if ! $(buildConfig)
|
if ! $(buildConfig)
|
||||||
{
|
{
|
||||||
EXIT "No BuildConfig!"
|
ECHO "No BuildConfig found in $(OBOS_BUILD_DIR)!" ;
|
||||||
"Run ./configure in the source tree's root directory first!" ;
|
EXIT "Run ./configure in the source tree's root directory first!" ;
|
||||||
}
|
}
|
||||||
include $(buildConfig) ;
|
LOCATE on BuildConfig = $(OBOS_BUILD_DIR) ;
|
||||||
|
include BuildConfig ;
|
||||||
}
|
}
|
||||||
|
|
||||||
# We do not include any local BeOS system headers by default
|
# We do not include any local BeOS system headers by default
|
||||||
|
|||||||
Reference in New Issue
Block a user