Changeset 432a269 in mainline for uspace/Makefile

Timestamp:

2011-09-16T21:13:57Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3a11f17

Parents:

c0e53ff (diff), fd07e526 (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) (3 diffs)

uspace/Makefile

@@ -119 +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
 #
@@ -174 +187 @@
         lib/drv \
         lib/packet \
-        lib/imgmap \
+        lib/fb \
         lib/net \
         lib/ext2 \
@@ -181 +194 @@
         lib/usbdev \
         lib/usbhid \
-        lib/usbvirt
+        lib/usbvirt \
+        lib/posix
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))