Changeset 23895

Show
Ignore:
Timestamp:
02/06/08 07:22:14 (3 months ago)
Author:
bonefish
Message:
Beginnings of an optional "Development" package. Currently only the glue
code and the library symlinks are installed.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • haiku/trunk/build/jam/HaikuImage

    r23889 r23895  
    6262        Playground Pulse Sudoku 
    6363; 
    64 BEOS_SYSTEM_LIB = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so 
     64BEOS_SYSTEM_LIBS = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so 
    6565        libtranslation.so libnetwork.so libdebug.so libbsd.so libmail.so 
    6666        libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so libmidi2.so 
     
    177177 
    178178# libs 
    179 AddFilesToHaikuImage beos system lib : $(BEOS_SYSTEM_LIB) ; 
     179AddFilesToHaikuImage beos system lib : $(BEOS_SYSTEM_LIBS) ; 
     180 
    180181# libnetwork.so replaces quite a few libraries 
    181 AddSymlinkToHaikuImage beos system lib : libnetwork.so : libsocket.so ; 
    182 AddSymlinkToHaikuImage beos system lib : libnetwork.so : libbind.so ; 
    183 AddSymlinkToHaikuImage beos system lib : libnetwork.so : libnet.so ; 
    184 AddSymlinkToHaikuImage beos system lib : libnetwork.so : libnetapi.so ; 
    185 AddSymlinkToHaikuImage beos system lib : libnetwork.so : libbnetapi.so ; 
    186 # libGL.so have GLUT built-in 
     182BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES 
     183        = libsocket.so libbind.so libnet.so libnetapi.so libbnetapi.so ; 
     184 
     185local lib ; 
     186for lib in $(BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES) { 
     187        AddSymlinkToHaikuImage beos system lib : libnetwork.so : $(lib) ; 
     188
     189 
     190# libGL.so has GLUT built-in 
    187191if $(TARGET_ARCH) = x86 { 
    188192        AddSymlinkToHaikuImage beos system lib : $(X86_ONLY)libGL.so : libglut.so ; 
     
    474478 
    475479 
     480# Development 
     481if [ IsOptionalHaikuImagePackageAdded Development ] 
     482                && $(TARGET_ARCH) = x86 { 
     483        # glue code 
     484        AddFilesToHaikuImage develop lib x86 
     485                : <src!system!glue!arch!x86>crti.o <src!system!glue!arch!x86>crtn.o 
     486                  <src!system!glue>init_term_dyn.o <src!system!glue>start_dyn.o ; 
     487 
     488        # library symlinks 
     489        local lib ; 
     490        for lib in $(BEOS_SYSTEM_LIBS) $(BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES) { 
     491                AddSymlinkToHaikuImage develop lib x86 : /system/lib/$(lib:BS) ; 
     492        } 
     493} 
     494 
    476495# Vision 
    477496if [ IsOptionalHaikuImagePackageAdded Vision ] {