Changeset b7068da in mainline for uspace/Makefile

Timestamp:

2012-02-09T20:35:12Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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) (4 diffs)

uspace/Makefile

@@ -64 +64 @@
         app/nettest1 \
         app/nettest2 \
+        app/nettest3 \
         app/ping \
         app/websrv \
@@ -92 +93 @@
         srv/hid/fb \
         srv/hid/input \
-        srv/hw/char/i8042 \
+        srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
         srv/net/il/arp \
@@ -104 +105 @@
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
+        drv/char/i8042 \
+        drv/char/ps2mouse \
+        drv/char/xtkbd \
         drv/test/test1 \
         drv/test/test2 \
@@ -118 +122 @@
         drv/bus/usb/vhc \
         drv/nic/lo \
-        drv/nic/ne2k
+        drv/nic/ne2k \
+        drv/nic/e1k \
+        drv/nic/rtl8139
 
 ifeq ($(CONFIG_PCC),y)