Changeset efdfebc in mainline for uspace/Makefile

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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) (14 diffs)

uspace/Makefile

@@ -35 +35 @@
 DIRS = \
         app/bdsh \
+        app/bithenge \
         app/blkdump \
         app/bnchmark \
@@ -47 +48 @@
         app/klog \
         app/loc \
-        app/lsusb \
+        app/logset \
         app/mkfat \
         app/mkexfat \
@@ -59 +60 @@
         app/tester \
         app/testread \
+        app/testwrit \
         app/tetris \
         app/trace \
@@ -71 +73 @@
         app/sysinfo \
         app/mkbd \
+        app/date \
         app/websrv \
+        app/vdemo \
+        app/vlaunch \
+        app/vterm \
         srv/clipboard \
         srv/locsrv \
+        srv/logger \
         srv/devman \
         srv/loader \
@@ -85 +92 @@
         srv/vfs \
         srv/bd/ata_bd \
+        srv/bd/sata_bd \
         srv/bd/file_bd \
         srv/bd/gxe_bd \
@@ -91 +99 @@
         srv/bd/part/mbr_part \
         srv/fs/exfat \
+        srv/fs/udf \
         srv/fs/fat \
         srv/fs/cdfs \
@@ -97 +106 @@
         srv/fs/locfs \
         srv/fs/ext2fs \
+        srv/fs/ext4fs \
+        srv/hid/compositor \
         srv/hid/console \
         srv/hid/s3c24xx_ts \
-        srv/hid/fb \
+        srv/hid/isdv4_tablet \
         srv/hid/input \
+        srv/hid/output \
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
+        drv/block/ahci \
         drv/char/i8042 \
         drv/char/ps2mouse \
@@ -111 +124 @@
         drv/test/test2 \
         drv/test/test3 \
+        drv/fb/kfb \
         drv/bus/usb/ehci \
         drv/bus/usb/ohci \
@@ -123 +137 @@
         drv/nic/ne2k \
         drv/nic/e1k \
-        drv/nic/rtl8139
+        drv/nic/rtl8139 \
 
 ifeq ($(CONFIG_PCC),y)
@@ -152 +166 @@
                 drv/bus/isa \
                 drv/char/ns8250 \
+                drv/time/cmos-rtc \
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
@@ -162 +177 @@
                 drv/bus/isa \
                 drv/char/ns8250 \
+                drv/time/cmos-rtc \
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
@@ -169 +185 @@
         DIRS += \
                 drv/infrastructure/rootmac \
+                drv/bus/pci/pciintel \
                 srv/hw/bus/cuda_adb
 endif
@@ -190 +207 @@
         lib/softfloat \
         lib/drv \
-        lib/fb \
+        lib/graph \
+        lib/gui \
+        lib/softrend \
+        lib/draw \
         lib/net \
         lib/nic \
         lib/ext2 \
+        lib/ext4 \
         lib/usb \
         lib/usbhost \
@@ -199 +220 @@
         lib/usbhid \
         lib/usbvirt \
+        lib/bithenge \
         lib/posix