From 5722edeb67fe444e21772c90deedb932be4bcde8 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 25 Sep 2010 16:21:22 +0000 Subject: [PATCH] Moved make and mkdepend to OptionalPackages, updated libtool to 2.4. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38813 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 736ea7a5ff..1196bcd40d 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -489,8 +489,8 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 { InstallSourceArchive automake-1.11.1_haiku-2010-04-29.tar.xz : $(baseSourceURL)/automake-1.11.1_haiku-2010-04-29.tar.xz ; - InstallOptionalHaikuImagePackage libtool-2.2.10-x86-gcc2-2010-06-10.zip - : $(baseURL)/libtool-2.2.10-x86-gcc2-2010-06-10.zip + InstallOptionalHaikuImagePackage libtool-2.4-x86-gcc2-2010-09-25.zip + : $(baseURL)/libtool-2.4-x86-gcc2-2010-09-25.zip : : true ; @@ -555,6 +555,10 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] : $(baseSourceURL)/flex-2.5.35_haiku-2010-04-29.tar.xz ; InstallOptionalHaikuImagePackage jam-2.5-r1a2-x86-gcc2-2010-04-21.zip : $(baseURL)/jam-2.5-r1a2-x86-gcc2-2010-04-21.zip ; + InstallOptionalHaikuImagePackage mkdepend-1.7-x86-gcc2-2010-09-24.zip + : $(baseURL)/mkdepend-1.7-x86-gcc2-2010-09-24.zip ; + InstallOptionalHaikuImagePackage make-3.82-x86-gcc2-2010-09-25.zip + : $(baseURL)/make-3.82-x86-gcc2-2010-09-25.zip ; } @@ -625,11 +629,6 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 { SEARCH on $(scripts) = [ FDirName $(HAIKU_TOP) data bin ] ; AddFilesToHaikuImage system bin : $(scripts) ; - # make and mkdepend build tool, which are part of the Haiku source tree - # TODO: Both should be removed from the tree, made download packages - # and moved to the DevelopmentBase package. - AddFilesToHaikuImage system bin : make mkdepend ; - # skeleton makefile and makefile-engine local makefileEngineFiles = makefile