Changeset 1d2a1a9 in mainline for uspace/Makefile

Timestamp:

2011-08-17T20:44:32Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

0cc32f2

Parents:

bb285b4 (diff), c53a705 (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 libposix changes.

File:

• uspace/Makefile (modified) (4 diffs)

uspace/Makefile

@@ -65 +65 @@
         app/mkbd \
         srv/clip \
-        srv/devmap \
+        srv/loc \
         srv/devman \
         srv/loader \
@@ -79 +79 @@
         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 \
@@ -126 +127 @@
 #
 
-ifneq ($(UARCH),abs32le)
-        DIRS += srv/hid/console
-endif
-
 ifeq ($(UARCH),amd64)
         DIRS += \
@@ -174 +171 @@
         lib/drv \
         lib/packet \
+        lib/imgmap \
         lib/net \
         lib/ext2 \