Changeset 76ca3f7 in mainline for uspace/srv/bd


Ignore:
Timestamp:
2010-03-23T20:49:54Z (16 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e417b96
Parents:
b48ebd19 (diff), 63f8966 (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 mailnline changes, revision 329

Location:
uspace/srv/bd
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/bd/ata_bd/Makefile

    rb48ebd19 r76ca3f7  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = ata_bd
     31BINARY = ata_bd
    3432
    3533SOURCES = \
    3634        ata_bd.c
    3735
    38 include ../../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/bd/ata_bd/ata_bd.c

    rb48ebd19 r76ca3f7  
    5656#include <as.h>
    5757#include <fibril_synch.h>
    58 #include <string.h>
     58#include <str.h>
    5959#include <devmap.h>
    6060#include <sys/types.h>

  • uspace/srv/bd/ata_bd/ata_bd.h

    rb48ebd19 r76ca3f7  
    3838#include <sys/types.h>
    3939#include <fibril_synch.h>
    40 #include <string.h>
     40#include <str.h>
    4141
    4242enum {

  • uspace/srv/bd/file_bd/Makefile

    rb48ebd19 r76ca3f7  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = file_bd
     31BINARY = file_bd
    3432
    3533SOURCES = \
    3634        file_bd.c
    3735
    38 include ../../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/bd/gxe_bd/Makefile

    rb48ebd19 r76ca3f7  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = gxe_bd
     31BINARY = gxe_bd
    3432
    3533SOURCES = \
    3634        gxe_bd.c
    3735
    38 include ../../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/bd/part/guid_part/Makefile

    rb48ebd19 r76ca3f7  
    2828
    2929USPACE_PREFIX = ../../../..
    30 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
     30LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    3131EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
    3232
    3333# Correct name is 'guid_part' but must use this because of FAT 8.3 names.
    34 OUTPUT = g_part
     34BINARY = g_part
    3535
    3636SOURCES = \
    3737        guid_part.c
    3838
    39 include ../../../Makefile.common
     39include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/bd/part/mbr_part/Makefile

    rb48ebd19 r76ca3f7  
    2929
    3030USPACE_PREFIX = ../../../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBC_PREFIX)/libc.a
     31LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    3232EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
    33 
    34 OUTPUT = mbr_part
     33BINARY = mbr_part
    3534
    3635SOURCES = \
    3736        mbr_part.c
    3837
    39 include ../../../Makefile.common
     38include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/bd/rd/Makefile

    rb48ebd19 r76ca3f7  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    33 OUTPUT = rd
     31BINARY = rd
    3432
    3533SOURCES = \
    3634        rd.c
    3735
    38 include ../../Makefile.common
     36include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.