Changeset 03362fbd in mainline for uspace/Makefile

Timestamp:

2013-02-09T23:14:45Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/Makefile (modified) (15 diffs)

uspace/Makefile

@@ -35 +35 @@
 DIRS = \
         app/bdsh \
+        app/bithenge \
         app/blkdump \
         app/bnchmark \
@@ -40 +41 @@
         app/drec \
         app/edit \
-        app/ext2info \
         app/getterm \
         app/init \
@@ -48 +48 @@
         app/klog \
         app/loc \
-        app/lsusb \
         app/mixerctl \
+        app/logset \
         app/mkfat \
         app/mkexfat \
@@ -61 +61 @@
         app/tester \
         app/testread \
+        app/testwrit \
         app/tetris \
         app/trace \
@@ -74 +75 @@
         app/mkbd \
         app/wavplay \
+        app/date \
         app/websrv \
         srv/audio/hound \
+        app/vdemo \
+        app/vlaunch \
+        app/vterm \
         srv/clipboard \
         srv/locsrv \
+        srv/logger \
         srv/devman \
         srv/loader \
@@ -96 +102 @@
         srv/bd/part/mbr_part \
         srv/fs/exfat \
+        srv/fs/udf \
         srv/fs/fat \
         srv/fs/cdfs \
@@ -101 +108 @@
         srv/fs/mfs \
         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 \
@@ -118 +127 @@
         drv/test/test2 \
         drv/test/test3 \
+        drv/fb/kfb \
         drv/bus/usb/ehci \
         drv/bus/usb/ohci \
@@ -130 +140 @@
         drv/nic/ne2k \
         drv/nic/e1k \
-        drv/nic/rtl8139
+        drv/nic/rtl8139 \
 
 ifeq ($(CONFIG_PCC),y)
@@ -159 +169 @@
                 drv/bus/isa \
                 drv/char/ns8250 \
+                drv/time/cmos-rtc \
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
@@ -169 +180 @@
                 drv/bus/isa \
                 drv/char/ns8250 \
+                drv/time/cmos-rtc \
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
@@ -176 +188 @@
         DIRS += \
                 drv/infrastructure/rootmac \
+                drv/bus/pci/pciintel \
                 srv/hw/bus/cuda_adb
 endif
@@ -182 +195 @@
         DIRS += \
                 srv/hw/irc/obio
+endif
+
+ifeq ($(UARCH),arm32)
+        DIRS += \
+                drv/infrastructure/rootamdm37x \
+                drv/fb/amdm37x_dispc
 endif
 
@@ -197 +216 @@
         lib/softfloat \
         lib/drv \
-        lib/fb \
         lib/hound \
+        lib/graph \
+        lib/gui \
+        lib/softrend \
+        lib/draw \
         lib/net \
         lib/nic \
-        lib/ext2 \
+        lib/ext4 \
         lib/usb \
         lib/usbhost \
@@ -208 +230 @@
         lib/usbvirt \
         lib/pcm \
+        lib/bithenge \
         lib/posix