Changeset 6843a9c in mainline for uspace/Makefile

Timestamp:

2012-06-29T13:02:14Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/Makefile (modified) (5 diffs)

uspace/Makefile

@@ -43 +43 @@
         app/getterm \
         app/init \
+        app/inet \
         app/kill \
         app/killall \
         app/klog \
-        app/locinfo \
+        app/loc \
         app/lsusb \
         app/mixerctl \
         app/mkfat \
+        app/mkexfat \
         app/mkmfs \
+        app/nterm \
         app/redir \
         app/sbi \
@@ -66 +69 @@
         app/nettest1 \
         app/nettest2 \
+        app/nettest3 \
         app/ping \
-        app/websrv \
         app/sysinfo \
         app/mkbd \
-        srv/clip \
-        srv/loc \
+        app/websrv \
+        srv/clipboard \
+        srv/locsrv \
         srv/devman \
         srv/loader \
+        srv/net/ethip \
+        srv/net/inetsrv \
+        srv/net/loopip \
+        srv/net/tcp \
+        srv/net/udp \
         srv/ns \
         srv/taskmon \
@@ -94 +103 @@
         srv/hid/fb \
         srv/hid/input \
-        srv/hw/char/i8042 \
+        srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
-        srv/net/il/arp \
-        srv/net/il/ip \
-        srv/net/tl/icmp \
-        srv/net/tl/udp \
-        srv/net/tl/tcp \
-        srv/net/nil/eth \
-        srv/net/nil/nildummy \
-        srv/net/net \
         drv/audio/sb16 \
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
+        drv/char/i8042 \
+        drv/char/ps2mouse \
+        drv/char/xtkbd \
         drv/test/test1 \
         drv/test/test2 \
@@ -120 +124 @@
         drv/bus/usb/usbmid \
         drv/bus/usb/vhc \
-        drv/nic/lo \
-        drv/nic/ne2k
+        drv/nic/ne2k \
+        drv/nic/e1k \
+        drv/nic/rtl8139
 
 ifeq ($(CONFIG_PCC),y)
@@ -134 +139 @@
 DIRS += \
         app/binutils
+endif
+
+ifeq ($(CONFIG_MSIM),y)
+DIRS += \
+        app/msim
 endif