Changeset 4c53333 in mainline for uspace/Makefile

Timestamp:

2013-07-11T08:21:10Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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 \
         app/devctl \
+        app/dnscfg \
+        app/dnsres \
         app/edit \
-        app/ext2info \
         app/getterm \
         app/init \
-        app/inetcfg \
+        app/inet \
         app/kill \
         app/killall \
         app/klog \
-        app/locinfo \
-        app/lsusb \
+        app/loc \
+        app/logset \
         app/mkfat \
         app/mkexfat \
         app/mkmfs \
+        app/nterm \
         app/redir \
         app/sbi \
@@ -58 +61 @@
         app/tester \
         app/testread \
+        app/testwrit \
         app/tetris \
         app/trace \
@@ -68 +72 @@
         app/nettest3 \
         app/ping \
-        app/websrv \
+        app/ping6 \
         app/sysinfo \
         app/mkbd \
-        srv/clip \
-        srv/loc \
+        app/date \
+        app/websrv \
+        app/vdemo \
+        app/vlaunch \
+        app/vterm \
+        srv/clipboard \
+        srv/locsrv \
+        srv/logger \
         srv/devman \
         srv/loader \
+        srv/net/dnsrsrv \
         srv/net/ethip \
-        srv/net/inet \
+        srv/net/inetsrv \
+        srv/net/loopip \
+        srv/net/slip \
         srv/net/tcp \
         srv/net/udp \
@@ -82 +95 @@
         srv/taskmon \
         srv/vfs \
-        srv/bd/ata_bd \
+        srv/bd/sata_bd \
         srv/bd/file_bd \
-        srv/bd/gxe_bd \
         srv/bd/rd \
         srv/bd/part/guid_part \
         srv/bd/part/mbr_part \
         srv/fs/exfat \
+        srv/fs/udf \
         srv/fs/fat \
         srv/fs/cdfs \
@@ -94 +107 @@
         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 \
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
+        drv/block/ahci \
+        drv/block/ata_bd \
         drv/char/i8042 \
         drv/char/ps2mouse \
@@ -109 +126 @@
         drv/test/test2 \
         drv/test/test3 \
+        drv/fb/kfb \
         drv/bus/usb/ehci \
         drv/bus/usb/ohci \
@@ -119 +137 @@
         drv/bus/usb/usbmid \
         drv/bus/usb/vhc \
-        drv/nic/lo \
         drv/nic/ne2k \
         drv/nic/e1k \
@@ -137 +154 @@
 endif
 
+ifeq ($(CONFIG_MSIM),y)
+DIRS += \
+        app/msim
+endif
+
 ## Platform-specific hardware support
 #
@@ -146 +168 @@
                 drv/bus/isa \
                 drv/char/ns8250 \
+                drv/time/cmos-rtc \
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
@@ -156 +179 @@
                 drv/bus/isa \
                 drv/char/ns8250 \
+                drv/time/cmos-rtc \
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259
@@ -163 +187 @@
         DIRS += \
                 drv/infrastructure/rootmac \
+                drv/bus/pci/pciintel \
                 srv/hw/bus/cuda_adb
 endif
@@ -169 +194 @@
         DIRS += \
                 srv/hw/irc/obio
+endif
+
+ifeq ($(UARCH),arm32)
+        DIRS += \
+                drv/infrastructure/rootamdm37x \
+                drv/fb/amdm37x_dispc
 endif
 
@@ -184 +215 @@
         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 \
@@ -193 +227 @@
         lib/usbhid \
         lib/usbvirt \
+        lib/bithenge \
         lib/posix