Changeset 61c0402 in mainline for uspace/srv/hw/bus/pci/Makefile.common

Timestamp:

2010-01-15T19:36:53Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

92bee46

Parents:

50f9c3a (diff), 963462af (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 mainline changes.

File:

• uspace/srv/hw/bus/pci/Makefile.common (moved) (moved from uspace/srv/pci/Makefile.common ) (2 diffs)

uspace/srv/hw/bus/pci/Makefile.common ¶

@@ -31 +31 @@
 #
 
-LIBC_PREFIX = ../../lib/libc
-SOFTINT_PREFIX = ../../lib/softint
+LIBC_PREFIX = ../../../../lib/libc
+SOFTINT_PREFIX = ../../../../lib/softint
 LIBPCI = libpci/libpci.a
 LIBS = $(LIBPCI) $(LIBC_PREFIX)/libc.a
@@ -38 +38 @@
 DEPEND = Makefile.depend
 DEPEND_PREV = $(DEPEND).prev
+JOB = pci.job
 OUTPUT = pci