Changeset 48e1467 in mainline for uspace/Makefile

Timestamp:

2010-01-22T16:52:17Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0cb2d72

Parents:

92bee46 (diff), 9d3133d (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/Makefile (modified) (2 diffs)

uspace/Makefile

@@ -52 +52 @@
         srv/bd/gxe_bd \
         srv/bd/rd \
+        srv/bd/part/guid_part \
         srv/bd/part/mbr_part \
         srv/fs/fat \
@@ -81 +82 @@
         lib/libblock \
         lib/softint \
-        lib/softfloat
+        lib/softfloat \
+
+ifeq ($(UARCH),amd64)
+        LIBS += lib/libpci
+endif
+
+ifeq ($(UARCH),ia32)
+        LIBS += lib/libpci
+endif
+
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))