Changeset 3e67ab1 in mainline


Ignore:
Timestamp:
2012-05-17T17:56:40Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c196671, c4b0317, eb083ad
Parents:
2bd578a
Message:

Based on popular vote, move websrv back into /app.

Files:
2 edited
2 moved

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r2bd578a r3e67ab1  
    112112        $(USPACE_PATH)/srv/net/udp/udp \
    113113        $(USPACE_PATH)/srv/taskmon/taskmon \
    114         $(USPACE_PATH)/srv/devman/devman \
    115         $(USPACE_PATH)/srv/websrv/websrv
     114        $(USPACE_PATH)/srv/devman/devman
    116115
    117116RD_DRVS = \
    … …  
    185184        $(USPACE_PATH)/app/usbinfo/usbinfo \
    186185        $(USPACE_PATH)/app/vuhid/vuh \
    187         $(USPACE_PATH)/app/mkbd/mkbd
     186        $(USPACE_PATH)/app/mkbd/mkbd \
     187        $(USPACE_PATH)/app/websrv/websrv
    188188
    189189ifeq ($(CONFIG_PCC),y)

  • uspace/Makefile

    r2bd578a r3e67ab1  
    7171        app/sysinfo \
    7272        app/mkbd \
     73        app/websrv \
    7374        srv/clipboard \
    7475        srv/locsrv \
    … …  
    102103        srv/hid/remcons \
    103104        srv/hw/char/s3c24xx_uart \
    104         srv/websrv \
    105105        drv/infrastructure/root \
    106106        drv/infrastructure/rootvirt \
Note: See TracChangeset for help on using the changeset viewer.