Changeset eb522e8 in mainline for boot/Makefile.common


Ignore:
Timestamp:
2011-06-01T08:43:42Z (14 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8d6c1f1
Parents:
9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually :)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified boot/Makefile.common

    r9e2e715 reb522e8  
    9898        $(USPACE_PATH)/srv/fs/fat/fat \
    9999        $(USPACE_PATH)/srv/taskmon/taskmon \
    100         $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \
     100        $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \
    101101        $(USPACE_PATH)/srv/net/netif/lo/lo \
     102        $(USPACE_PATH)/srv/net/nil/eth/eth \
     103        $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
    102104        $(USPACE_PATH)/srv/net/il/arp/arp \
    103105        $(USPACE_PATH)/srv/net/il/ip/ip \
     
    109111       
    110112RD_DRVS = \
    111         root
     113        root \
     114        rootvirt \
     115        test1 \
     116        test2
    112117
    113118RD_DRV_CFG =
    114119
    115 ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
    116         RD_SRVS_NON_ESSENTIAL += \
    117                 $(USPACE_PATH)/srv/net/nil/eth/eth \
    118                 $(USPACE_PATH)/srv/net/nil/nildummy/nildummy
     120RD_LIBS =
     121
     122ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
     123        RD_LIBS += \
     124                $(USPACE_PATH)/lib/c/libc.so0 \
     125                $(USPACE_PATH)/lib/softint/libsofti.so0
     126        RD_APPS += \
     127                $(USPACE_PATH)/app/dltest/dltest
    119128endif
    120129
     
    125134
    126135RD_APPS_NON_ESSENTIAL = \
     136        $(USPACE_PATH)/app/dltest/dltest \
     137        $(USPACE_PATH)/app/dltest2/dltest2 \
     138        $(USPACE_PATH)/app/dload/dload \
    127139        $(USPACE_PATH)/app/edit/edit \
     140        $(USPACE_PATH)/app/kill/kill \
     141        $(USPACE_PATH)/app/killall/killall \
    128142        $(USPACE_PATH)/app/mkfat/mkfat \
     143        $(USPACE_PATH)/app/lsusb/lsusb \
    129144        $(USPACE_PATH)/app/sbi/sbi \
    130145        $(USPACE_PATH)/app/redir/redir \
    131146        $(USPACE_PATH)/app/taskdump/taskdump \
    132147        $(USPACE_PATH)/app/tester/tester \
    133         $(USPACE_PATH)/app/test_serial/test_serial \
    134148        $(USPACE_PATH)/app/tetris/tetris \
    135149        $(USPACE_PATH)/app/trace/trace \
    136         $(USPACE_PATH)/app/netstart/netstart \
    137150        $(USPACE_PATH)/app/nettest1/nettest1 \
    138151        $(USPACE_PATH)/app/nettest2/nettest2 \
     
    140153        $(USPACE_PATH)/app/ping/ping \
    141154        $(USPACE_PATH)/app/stats/stats \
    142         $(USPACE_PATH)/app/tasks/tasks \
    143         $(USPACE_PATH)/app/top/top
     155        $(USPACE_PATH)/app/sysinfo/sysinfo \
     156        $(USPACE_PATH)/app/top/top \
     157        $(USPACE_PATH)/app/usbinfo/usbinfo \
     158        $(USPACE_PATH)/app/vuhid/vuh \
     159        $(USPACE_PATH)/app/mkbd/mkbd \
     160        $(USPACE_PATH)/app/websrv/websrv
    144161
    145162ifneq ($(CONFIG_BAREBONE),y)
Note: See TracChangeset for help on using the changeset viewer.