Changeset cc1f8d4 in mainline for uspace/srv/pci


Ignore:
Timestamp:
2009-10-20T16:08:08Z (16 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
50989793
Parents:
00413c5c
Message:

proper support for parallel building (this time really tested)
all ports except sparc64 (which should follow soon)

Location:
uspace/srv/pci
Files:
4 added
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/pci/Makefile

    r00413c5c rcc1f8d4  
    11#
    22# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 ## Setup toolchain
    30 #
     30include Makefile.common
    3131
    32 LIBC_PREFIX = ../../lib/libc
    33 SOFTINT_PREFIX = ../../lib/softint
     32.PHONY: all clean
    3433
    35 include $(LIBC_PREFIX)/Makefile.toolchain
     34all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
     35        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     36        $(MAKE) -f Makefile.build
    3637
    37 
    38 LIBS = libpci/libpci.a $(LIBC_PREFIX)/libc.a
    39 
    40 ## Sources
    41 #
    42 
    43 OUTPUT = pci
    44 SOURCES = \
    45         pci.c
    46 
    47 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    48 
    49 .PHONY: all clean depend
    50 
    51 all: $(OUTPUT) $(OUTPUT).disasm
    52 
    53 -include Makefile.depend
     38$(LIBPCI):
     39        $(MAKE) -C libpci
    5440
    5541clean:
    56         -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
    5742        $(MAKE) -C libpci clean
    58 
    59 depend:
    60         $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
    61 
    62 $(OUTPUT): $(OBJECTS) $(LIBS)
    63         $(MAKE) -C libpci
    64         $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    65 
    66 $(OUTPUT).disasm: $(OUTPUT)
    67         $(OBJDUMP) -d $< > $@
    68 
    69 %.o: %.S
    70         $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
    71 
    72 %.o: %.s
    73         $(AS) $(AFLAGS) $< -o $@
    74 
    75 %.o: %.c
    76         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
    77 
    78 libpci/libpci.a:
    79         $(MAKE) -C libpci
     43        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     44        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/srv/pci/libpci/Makefile

    r00413c5c rcc1f8d4  
    1 # Makefile for The PCI Library
    2 # (c) 1999 Martin Mares <mj@ucw.cz>
     1#
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
     4# All rights reserved.
     5#
     6# Redistribution and use in source and binary forms, with or without
     7# modification, are permitted provided that the following conditions
     8# are met:
     9#
     10# - Redistributions of source code must retain the above copyright
     11#   notice, this list of conditions and the following disclaimer.
     12# - Redistributions in binary form must reproduce the above copyright
     13#   notice, this list of conditions and the following disclaimer in the
     14#   documentation and/or other materials provided with the distribution.
     15# - The name of the author may not be used to endorse or promote products
     16#   derived from this software without specific prior written permission.
     17#
     18# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
     19# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
     20# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
     21# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
     22# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
     23# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
     24# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
     25# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     26# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
     27# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     28#
    329
    4 # Modified and ported to HelenOS by Jakub Jermar
     30include Makefile.common
    531
    6 LIBC_PREFIX=$(shell cd ../../../lib/libc; pwd)
     32.PHONY: all clean
    733
    8 include $(LIBC_PREFIX)/Makefile.toolchain
    9 
    10 LIBS = $(LIBC_PREFIX)/libc.a
    11 CFLAGS += -I$(LIBC_PREFIX)/include -trigraphs
    12 
    13 OBJS=access.o generic.o names.o
    14 INCL=internal.h pci.h header.h sysdep.h types.h pci_ids.h
    15 
    16 PCILIB=libpci.a
    17 
    18 OBJS += i386-ports.o
    19 
    20 all: $(PCILIB)
    21 
    22 $(PCILIB): $(OBJS)
    23         $(AR) rc $@ $(OBJS)
    24 
    25 %.o: %.c $(INCL)
    26         $(CC) $(CFLAGS) -c $< -o $@
     34all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
     35        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     36        $(MAKE) -f Makefile.build
    2737
    2838clean:
    29         -rm *.o libpci.a
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(LIBPCI)
     40        find . -name '*.o' -follow -exec rm \{\} \;
Note: See TracChangeset for help on using the changeset viewer.