Changeset 3b3e776 in mainline for uspace/srv/hw


Ignore:
Timestamp:
2010-02-05T10:57:50Z (15 years ago)
Author:
Lenka Trochtova <trochtova.lenka@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0358da0
Parents:
3f085132 (diff), b4cbef1 (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:

merged with head

Location:
uspace/srv/hw
Files:
6 added
13 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/hw/bus/cuda_adb/Makefile

    r3f085132 r3b3e776  
    11#
    2 # Copyright (c) 2005 Martin Decky
     2# Copyright (c) 2010 Jiri Svoboda
    33# All rights reserved.
    44#
    … …  
    2727#
    2828
     29USPACE_PREFIX = ../../../..
     30LIBS = $(LIBC_PREFIX)/libc.a
    2931
    30 ## Common names
    31 #
     32OUTPUT = cuda_adb
    3233
    33 LIBC_PREFIX = ../libc
    34 DEPEND = Makefile.depend
    35 DEPEND_PREV = $(DEPEND).prev
    36 LIBSOFTINT = libsoftint.a
     34SOURCES = \
     35        cuda_adb.c
     36
     37include ../../../Makefile.common
     38

  • uspace/srv/hw/bus/pci/Makefile

    r3f085132 r3b3e776  
    11#
    22# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
     30USPACE_PREFIX = ../../../..
     31LIBS = $(LIBPCI_PREFIX)/libpci.a $(LIBC_PREFIX)/libc.a
     32EXTRA_CFLAGS = -I$(LIBPCI_PREFIX)
    2933
    30 ## Common names
    31 #
     34OUTPUT = pci
    3235
    33 LIBC_PREFIX = ../../lib/libc
    34 SOFTINT_PREFIX = ../../lib/softint
    35 LIBS = $(LIBC_PREFIX)/libc.a
     36SOURCES = \
     37        pci.c
    3638
    37 DEPEND = Makefile.depend
    38 DEPEND_PREV = $(DEPEND).prev
    39 OUTPUT = init
     39include ../../../Makefile.common

  • uspace/srv/hw/char/i8042/Makefile

    r3f085132 r3b3e776  
    11#
    22# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 
    30 ## Common names
    31 #
    32 
    33 LIBC_PREFIX = ../../lib/libc
    34 SOFTINT_PREFIX = ../../lib/softint
     30USPACE_PREFIX = ../../../..
    3531LIBS = $(LIBC_PREFIX)/libc.a
    3632
    37 DEPEND = Makefile.depend
    38 DEPEND_PREV = $(DEPEND).prev
    39 OUTPUT = dd
     33OUTPUT = i8042
     34
     35SOURCES = \
     36        i8042.c
     37
     38include ../../../Makefile.common

  • uspace/srv/hw/cir/fhc/Makefile

    r3f085132 r3b3e776  
    11#
    22# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 
    30 ## Common names
    31 #
    32 
    33 LIBC_PREFIX = ../../lib/libc
    34 SOFTINT_PREFIX = ../../lib/softint
     30USPACE_PREFIX = ../../../..
    3531LIBS = $(LIBC_PREFIX)/libc.a
    3632
    37 DEPEND = Makefile.depend
    38 DEPEND_PREV = $(DEPEND).prev
    39 OUTPUT = ns
     33OUTPUT = fhc
     34
     35SOURCES = \
     36        fhc.c
     37
     38include ../../../Makefile.common

  • uspace/srv/hw/cir/obio/Makefile

    r3f085132 r3b3e776  
    11#
    22# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 
    30 ## Common names
    31 #
    32 
    33 LIBC_PREFIX = ../../lib/libc
    34 SOFTINT_PREFIX = ../../lib/softint
     30USPACE_PREFIX = ../../../..
    3531LIBS = $(LIBC_PREFIX)/libc.a
    3632
    37 DEPEND = Makefile.depend
    38 DEPEND_PREV = $(DEPEND).prev
    39 OUTPUT = kbd
     33OUTPUT = obio
     34
     35SOURCES = \
     36        obio.c
     37
     38include ../../../Makefile.common
Note: See TracChangeset for help on using the changeset viewer.