From 020bfa8211ff2a3d40748619a63382650accd961 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 29 Mar 2008 14:49:30 +0000 Subject: [PATCH] * Added the ncurses headers to the Development optional package. * Simplified the addition of the libpng and zlib headers. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24656 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index d6cf47c489..e0d3b93d8f 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -513,13 +513,10 @@ if [ IsOptionalHaikuImagePackageAdded Development ] 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) ; + # third party libs headers + AddHeaderDirectoryToHaikuImage libs ncurses : 3rdparty ; + AddHeaderDirectoryToHaikuImage libs png : 3rdparty ; + AddHeaderDirectoryToHaikuImage libs zlib : 3rdparty ; if $(HAIKU_GCC_VERSION[1]) > 2 { # gcc 4