i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* For some reason, the ICOTranslator was not included in the image.

Browse Source 
* Automatic whitespace cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33537 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-10-11 21:06:59 +00:00
parent 30580df348
commit 31d18c5c55
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+20 -19
View File
@@ -39,7 +39,7 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2
hd head hey hostname hd head hey hostname
id ident ifconfig <bin>install installsound iroster isvolume id ident ifconfig <bin>install installsound iroster isvolume
$(IDE_ONLY)ideinfo $(IDE_ONLY)idestatus $(IDE_ONLY)ideinfo $(IDE_ONLY)idestatus
join keymap kill join keymap kill
less lessecho lesskey link linkcatkeys listarea listattr listimage listdev less lessecho lesskey link linkcatkeys listarea listattr listimage listdev
listport listres listsem listusb ln locate logger login logname ls lsindex listport listres listsem listusb ln locate logger login logname ls lsindex
mail2mbox makebootable mbox2mail md5sum merge message mimeset mkdos mkdir mail2mbox makebootable mbox2mail md5sum merge message mimeset mkdos mkdir
@@ -78,21 +78,21 @@ SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo
; ;
ICU_LIBS = libicu-common.so libicu-data.so libicu-i18n.so ICU_LIBS = libicu-common.so libicu-data.so libicu-i18n.so
; ;
SYSTEM_LIBS = SYSTEM_LIBS =
libalm.so libalm.so
libbe.so libbsd.so libbnetapi.so libbe.so libbsd.so libbnetapi.so
libdebug.so libdevice.so libdebug.so libdevice.so
libfluidsynth.so libfreetype.so libfluidsynth.so libfreetype.so
libgame.so libGL.so libgnu.so libgame.so libGL.so libgnu.so
libilmimf.so libilmimf.so
libjpeg.so libjpeg.so
liblinprog.so liblocale.so liblpsolve55.so liblinprog.so liblocale.so liblpsolve55.so
libmail.so libmedia.so libmidi.so libmidi2.so libmail.so libmedia.so libmidi.so libmidi2.so
libnetwork.so libnetwork.so
libpng.so libpng.so
<revisioned>libroot.so <revisioned>libroot.so
libscreensaver.so libscreensaver.so
libtextencoding.so libtracker.so libtranslation.so libtextencoding.so libtracker.so libtranslation.so
libz.so libz.so
$(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++) $(ICU_LIBS) $(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++) $(ICU_LIBS)
; ;
@@ -116,7 +116,8 @@ SYSTEM_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant
#$(X86_ONLY)vmware.accelerant #$(X86_ONLY)vmware.accelerant
; ;
SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator
JPEGTranslator JPEG2000Translator PCXTranslator PNGTranslator PPMTranslator ICOTranslator JPEGTranslator JPEG2000Translator
PCXTranslator PNGTranslator PPMTranslator
RAWTranslator RTF-Translator SGITranslator STXTTranslator TGATranslator RAWTranslator RTF-Translator SGITranslator STXTTranslator TGATranslator
TIFFTranslator WonderBrushTranslator TIFFTranslator WonderBrushTranslator
; ;
@@ -164,8 +165,8 @@ SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)broadcom440x
$(X86_ONLY)via_rhine wb840 $(X86_ONLY)ipro100 $(X86_ONLY)nforce $(X86_ONLY)via_rhine wb840 $(X86_ONLY)ipro100 $(X86_ONLY)nforce
#vlance #vlance
$(X86_ONLY)marvell_yukon $(X86_ONLY)syskonnect $(X86_ONLY)marvell_yukon $(X86_ONLY)syskonnect
$(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2 $(X86_ONLY)ar81xx $(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2 $(X86_ONLY)ar81xx
usb_ecm usb_asix usb_ecm usb_asix
; ;
#SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ; #SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ;
SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
@@ -372,7 +373,7 @@ AddFilesToHaikuImage system data artwork : $(logoArtwork) ;
AddDirectoryToHaikuImage system data sounds ; AddDirectoryToHaikuImage system data sounds ;
# Add mail provider infos. # Add mail provider infos.
AddFilesToHaikuImage home config settings Mail ProviderInfo : AddFilesToHaikuImage home config settings Mail ProviderInfo :
$(HAIKU_PROVIDER_INFOS) ; $(HAIKU_PROVIDER_INFOS) ;
# Mail spell check dictionaries # Mail spell check dictionaries