Changeset 925a21e in mainline for uspace/Makefile

Timestamp:

2011-09-24T14:20:29Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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) (9 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 \
+        app/mkmfs \
         app/redir \
         app/sbi \
+        app/sportdmp \
         app/stats \
         app/taskdump \
@@ -65 +69 @@
         app/mkbd \
         srv/clip \
-        srv/devmap \
+        srv/loc \
         srv/devman \
         srv/loader \
@@ -77 +81 @@
         srv/bd/part/guid_part \
         srv/bd/part/mbr_part \
+        srv/fs/exfat \
         srv/fs/fat \
+        srv/fs/cdfs \
         srv/fs/tmpfs \
-        srv/fs/devfs \
+        srv/fs/mfs \
+        srv/fs/locfs \
         srv/fs/ext2fs \
+        srv/hid/console \
         srv/hid/s3c24xx_ts \
         srv/hid/fb \
@@ -111 +119 @@
         drv/bus/usb/vhc
 
+ifeq ($(CONFIG_PCC),y)
+DIRS += \
+        app/cc \
+        app/ccom \
+        app/ccom/mkext \
+        app/cpp
+endif
+
+ifeq ($(CONFIG_BINUTILS),y)
+DIRS += \
+        app/binutils
+endif
+
 ## Networking
 #
@@ -120 +141 @@
 ## Platform-specific hardware support
 #
-
-ifneq ($(UARCH),abs32le)
-        DIRS += srv/hid/console
-endif
 
 ifeq ($(UARCH),amd64)
@@ -164 +181 @@
         lib/block \
         lib/clui \
+        lib/fmtutil \
         lib/scsi \
         lib/softint \
@@ -169 +187 @@
         lib/drv \
         lib/packet \
+        lib/fb \
         lib/net \
         lib/ext2 \
@@ -175 +194 @@
         lib/usbdev \
         lib/usbhid \
-        lib/usbvirt
+        lib/usbvirt \
+        lib/posix
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))