Author: scottmc Date: 2010-09-25 18:21:22 +0200 (Sat, 25 Sep 2010) New Revision: 38813 Changeset: http://dev.haiku-os.org/changeset/38813 Modified: haiku/trunk/build/jam/OptionalPackages Log: Moved make and mkdepend to OptionalPackages, updated libtool to 2.4. Modified: haiku/trunk/build/jam/OptionalPackages =================================================================== --- haiku/trunk/build/jam/OptionalPackages 2010-09-25 14:50:18 UTC (rev 38812) +++ haiku/trunk/build/jam/OptionalPackages 2010-09-25 16:21:22 UTC (rev 38813) @@ -489,8 +489,8 @@ 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 @@ : $(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 @@ 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-engine>makefile