From c904fe377e0c21ab4d2c8d5e5c6083e7aa8c8136 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 26 Mar 2008 23:48:41 +0000 Subject: [PATCH] * Added new optional parameter to AddHeaderDirectoryToHaikuImage, specifying the name of the header directory on the image. * Renamed the "gnu" header directory on the image to "3rdparty" and created a "gnu" symlink for compatiblity. * Added zlib and libpng headers to the "3rdparty" header dir. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24600 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 18 +++++++++++++++--- build/jam/ImageRules | 7 ++++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index a658b800bf..b56296aed4 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -505,7 +505,7 @@ if [ IsOptionalHaikuImagePackageAdded Development ] AddFilesToHaikuImage beos bin : cc c++ ; # headers - AddHeaderDirectoryToHaikuImage gnu ; + AddHeaderDirectoryToHaikuImage gnu : 3rdparty ; AddHeaderDirectoryToHaikuImage os ; AddHeaderDirectoryToHaikuImage posix ; @@ -513,8 +513,20 @@ if [ IsOptionalHaikuImagePackageAdded Development ] SEARCH on
_G_config.h = [ FDirName $(HAIKU_TOP) headers glibc ] ; AddFilesToHaikuImage develop headers posix :
_G_config.h ; - # make be -> os symlink for now - AddSymlinkToHaikuImage develop headers : /boot/develop/headers/os : be ; + # create be -> os symlink for now + AddSymlinkToHaikuImage develop headers : os : be ; + + # create gnu -> 3rdparty symlink + AddSymlinkToHaikuImage develop headers : 3rdparty : gnu ; + # TODO: Change BEINCLUDES and gcc to refer to 3rdparty rather than gnu. + + # individual headers of third party libs + local zlibHeaders =
zlib.h
zconf.h ; + SEARCH on $(zlibHeaders) = [ FDirName $(HAIKU_TOP) headers libs zlib ] ; + local pngHeaders =
png.h
pngconf.h ; + SEARCH on $(pngHeaders) = [ FDirName $(HAIKU_TOP) headers libs png ] ; + AddFilesToHaikuImage develop headers 3rdparty + : $(zlibHeaders) $(pngHeaders) ; if $(HAIKU_GCC_VERSION[1]) > 2 { # gcc 4 diff --git a/build/jam/ImageRules b/build/jam/ImageRules index a02b475a5e..ca1873c9c5 100644 --- a/build/jam/ImageRules +++ b/build/jam/ImageRules @@ -598,13 +598,14 @@ rule AddSourceDirectoryToHaikuImage dirTokens : alwaysUpdate : : -x .svn : $(alwaysUpdate) ; } -rule AddHeaderDirectoryToHaikuImage dirTokens : alwaysUpdate +rule AddHeaderDirectoryToHaikuImage dirTokens : dirName : alwaysUpdate { - # AddHeaderDirectoryToHaikuImage : ; + # AddHeaderDirectoryToHaikuImage : [ ] + # : ; CopyDirectoryToHaikuImage develop headers : [ FDirName $(HAIKU_TOP) headers $(dirTokens) ] - : : -x .svn : $(alwaysUpdate) ; + : $(dirName) : -x .svn : $(alwaysUpdate) ; } rule UnzipArchiveToHaikuImage dirTokens : zipFile : alwaysUpdate