Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset b79d450 in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-01-27T20:35:49Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
fb6f1a5
Parents:
fccc236 (diff), 95e6c4f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile

    rfccc236 rb79d450  
    3838        app/init \
    3939        app/klog \
     40        app/mkfat \
    4041        app/redir \
     42        app/taskdump \
    4143        app/tester \
    4244        app/tetris \
     
    4648        srv/loader \
    4749        srv/ns \
     50        srv/taskmon \
    4851        srv/vfs \
    4952        srv/bd/ata_bd \
     
    5154        srv/bd/gxe_bd \
    5255        srv/bd/rd \
     56        srv/bd/part/guid_part \
    5357        srv/bd/part/mbr_part \
    5458        srv/fs/fat \
     
    8084        lib/libblock \
    8185        lib/softint \
    82         lib/softfloat
     86        lib/softfloat \
     87
     88ifeq ($(UARCH),amd64)
     89        LIBS += lib/libpci
     90endif
     91
     92ifeq ($(UARCH),ia32)
     93        LIBS += lib/libpci
     94endif
     95
    8396
    8497LIBC_BUILD = $(addsuffix .build,$(LIBC))
Note: See TracChangeset for help on using the changeset viewer.