Changes in / [7df0c2ff:ea8b91d] in mainline


Ignore:
Files:
33 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    r7df0c2ff rea8b91d  
    7474        $(USPACE_PATH)/srv/locsrv/locsrv \
    7575        $(USPACE_PATH)/srv/bd/rd/rd \
    76         $(USPACE_PATH)/srv/vfs/vfs \
    77        
    78 # TODO: For comfort ext4fs debugging - delete before merge     
    79 INIT_TASKS += $(USPACE_PATH)/srv/bd/ata_bd/ata_bd
    80 INIT_TASKS += $(USPACE_PATH)/srv/bd/sata_bd/sata_bd
     76        $(USPACE_PATH)/srv/vfs/vfs
    8177
    8278ifeq ($(RDFMT),tmpfs)
     
    110106        $(USPACE_PATH)/srv/fs/exfat/exfat \
    111107        $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
    112         $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
    113108        $(USPACE_PATH)/srv/hid/remcons/remcons \
    114109        $(USPACE_PATH)/srv/net/ethip/ethip \
     
    178173        $(USPACE_PATH)/app/tester/tester \
    179174        $(USPACE_PATH)/app/testread/testread \
    180         $(USPACE_PATH)/app/testwrit/testwrit \
    181175        $(USPACE_PATH)/app/tetris/tetris \
    182176        $(USPACE_PATH)/app/trace/trace \
  • uspace/Makefile

    r7df0c2ff rea8b91d  
    5858        app/tester \
    5959        app/testread \
    60         app/testwrit \
    6160        app/tetris \
    6261        app/trace \
     
    9897        srv/fs/locfs \
    9998        srv/fs/ext2fs \
    100         srv/fs/ext4fs \
    10199        srv/hid/console \
    102100        srv/hid/s3c24xx_ts \
     
    198196        lib/nic \
    199197        lib/ext2 \
    200         lib/ext4 \
    201198        lib/usb \
    202199        lib/usbhost \
  • uspace/Makefile.common

    r7df0c2ff rea8b91d  
    115115
    116116LIBEXT2_PREFIX = $(LIB_PREFIX)/ext2
    117 LIBEXT4_PREFIX = $(LIB_PREFIX)/ext4
    118117
    119118LIBUSB_PREFIX = $(LIB_PREFIX)/usb
Note: See TracChangeset for help on using the changeset viewer.