Changeset 3b3e776 in mainline for uspace/lib/libpci

Timestamp:

2010-02-05T10:57:50Z (16 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/lib/libpci

Files:

• COPYING (added)
• Makefile (moved) (moved from uspace/app/edit/Makefile.common ) (2 diffs)
• Makefile.build (moved) (moved from uspace/srv/pci/libpci/Makefile.build )
• Makefile.common (moved) (moved from uspace/srv/pci/libpci/Makefile.common )
• VERSION (added)
• access.c (added)
• generic.c (added)
• header.h (added)
• i386-ports.c (added)
• internal.h (added)
• names.c (added)
• pci.h (added)
• pci_ids.h (added)
• sysdep.h (added)
• types.h (added)

uspace/lib/libpci/Makefile

@@ -1 +1 @@
 #
 # Copyright (c) 2005 Martin Decky
+# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -27 +28 @@
 #
 
-
-## Common names
-#
-
-LIBC_PREFIX = ../../lib/libc
-SOFTINT_PREFIX = ../../lib/softint
+USPACE_PREFIX = ../..
 LIBS = $(LIBC_PREFIX)/libc.a
 
-DEPEND = Makefile.depend
-DEPEND_PREV = $(DEPEND).prev
-OUTPUT = edit
+OUTPUT = libpci.a
+
+SOURCES = \
+        access.c \
+        generic.c \
+        names.c \
+        i386-ports.c
+
+include ../Makefile.common