Changeset 8f8a0cd6 in mainline for boot/Makefile.common


Ignore:
Timestamp:
2011-01-07T09:13:55Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0f191a2, 692c0d3e
Parents:
71ed4849 (diff), ae1f70e (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 development/ changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    r71ed4849 r8f8a0cd6  
    101101        $(USPACE_PATH)/srv/hw/bus/usb/hcd/virtual/vhcd \
    102102        $(USPACE_PATH)/srv/net/netif/lo/lo \
     103        $(USPACE_PATH)/srv/net/nil/eth/eth \
     104        $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
    103105        $(USPACE_PATH)/srv/net/il/arp/arp \
    104106        $(USPACE_PATH)/srv/net/il/ip/ip \
     
    117119RD_DRV_CFG =
    118120
    119 ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
    120         RD_SRVS_NON_ESSENTIAL += \
    121                 $(USPACE_PATH)/srv/net/nil/eth/eth \
    122                 $(USPACE_PATH)/srv/net/nil/nildummy/nildummy
    123 endif
    124 
    125121RD_APPS_ESSENTIAL = \
    126122        $(USPACE_PATH)/app/bdsh/bdsh \
     
    130126RD_APPS_NON_ESSENTIAL = \
    131127        $(USPACE_PATH)/app/edit/edit \
     128        $(USPACE_PATH)/app/kill/kill \
     129        $(USPACE_PATH)/app/killall/killall \
    132130        $(USPACE_PATH)/app/mkfat/mkfat \
    133131        $(USPACE_PATH)/app/sbi/sbi \
     
    148146        $(USPACE_PATH)/app/top/top \
    149147        $(USPACE_PATH)/app/usbinfo/usbinfo \
    150         $(USPACE_PATH)/app/virtusbkbd/vuk
     148        $(USPACE_PATH)/app/virtusbkbd/vuk \
     149        $(USPACE_PATH)/app/websrv/websrv
    151150
    152151ifneq ($(CONFIG_BAREBONE),y)
Note: See TracChangeset for help on using the changeset viewer.