Changeset bd5f3b7 in mainline for uspace/Makefile

Timestamp:

2011-08-21T13:07:35Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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) (7 diffs)

uspace/Makefile

@@ -37 +37 @@
         app/blkdump \
         app/bnchmark \
+        app/devctl \
         app/edit \
         app/ext2info \
@@ -44 +45 @@
         app/killall \
         app/klog \
+        app/locinfo \
         app/lsusb \
         app/mkfat \
@@ -65 +67 @@
         app/mkbd \
         srv/clip \
-        srv/devmap \
+        srv/loc \
         srv/devman \
         srv/loader \
@@ -79 +81 @@
         srv/fs/fat \
         srv/fs/tmpfs \
-        srv/fs/devfs \
+        srv/fs/locfs \
         srv/fs/ext2fs \
+        srv/hid/console \
         srv/hid/s3c24xx_ts \
         srv/hid/fb \
@@ -121 +124 @@
 #
 
-ifneq ($(UARCH),abs32le)
-        DIRS += srv/hid/console
-endif
-
 ifeq ($(UARCH),amd64)
         DIRS += \
@@ -164 +163 @@
         lib/block \
         lib/clui \
+        lib/fmtutil \
         lib/scsi \
         lib/softint \
@@ -169 +169 @@
         lib/drv \
         lib/packet \
+        lib/imgmap \
         lib/net \
         lib/ext2 \