Changeset 49ff5f3 in mainline for uspace/Makefile

Timestamp:

2012-04-18T20:55:21Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7769ec9

Parents:

e895352 (diff), 63920b0 (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) (6 diffs)

uspace/Makefile

@@ -42 +42 @@
         app/getterm \
         app/init \
+        app/inetcfg \
         app/kill \
         app/killall \
@@ -48 +49 @@
         app/lsusb \
         app/mkfat \
+        app/mkexfat \
         app/mkmfs \
         app/redir \
@@ -64 +66 @@
         app/nettest1 \
         app/nettest2 \
+        app/nettest3 \
         app/ping \
         app/websrv \
@@ -72 +75 @@
         srv/devman \
         srv/loader \
+        srv/net/ethip \
+        srv/net/inet \
+        srv/net/tcp \
+        srv/net/udp \
         srv/ns \
         srv/taskmon \
@@ -92 +99 @@
         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/infrastructure/root \
         drv/infrastructure/rootvirt \
+        drv/char/i8042 \
+        drv/char/ps2mouse \
+        drv/char/xtkbd \
         drv/test/test1 \
         drv/test/test2 \
@@ -118 +120 @@
         drv/bus/usb/vhc \
         drv/nic/lo \
-        drv/nic/ne2k
+        drv/nic/ne2k \
+        drv/nic/e1k \
+        drv/nic/rtl8139
 
 ifeq ($(CONFIG_PCC),y)