Changeset b79d450 in mainline for uspace/Makefile

Timestamp:

2010-01-27T20:35:49Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fb6f1a5

Parents:

fccc236 (diff), 95e6c4f (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) (4 diffs)

uspace/Makefile

@@ -38 +38 @@
         app/init \
         app/klog \
+        app/mkfat \
         app/redir \
+        app/taskdump \
         app/tester \
         app/tetris \
@@ -46 +48 @@
         srv/loader \
         srv/ns \
+        srv/taskmon \
         srv/vfs \
         srv/bd/ata_bd \
@@ -51 +54 @@
         srv/bd/gxe_bd \
         srv/bd/rd \
+        srv/bd/part/guid_part \
         srv/bd/part/mbr_part \
         srv/fs/fat \
@@ -80 +84 @@
         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))