Changeset db96017 in mainline for uspace/Makefile

Timestamp:

2012-04-07T17:41:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b6913b7

Parents:

b69e4c0 (diff), 6bb169b5 (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) (7 diffs)

uspace/Makefile

@@ -48 +48 @@
         app/lsusb \
         app/mkfat \
+        app/mkexfat \
         app/mkmfs \
         app/redir \
@@ -64 +65 @@
         app/nettest1 \
         app/nettest2 \
+        app/nettest3 \
         app/ping \
         app/websrv \
@@ -92 +94 @@
         srv/hid/fb \
         srv/hid/input \
-        srv/hw/char/i8042 \
+        srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
-        srv/hw/netif/ne2000 \
-        srv/net/netif/lo \
         srv/net/il/arp \
         srv/net/il/ip \
@@ -101 +101 @@
         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 \
@@ -116 +121 @@
         drv/bus/usb/usbmast \
         drv/bus/usb/usbmid \
-        drv/bus/usb/usbmouse \
-        drv/bus/usb/vhc
+        drv/bus/usb/vhc \
+        drv/nic/lo \
+        drv/nic/ne2k \
+        drv/nic/e1k \
+        drv/nic/rtl8139
 
 ifeq ($(CONFIG_PCC),y)
@@ -131 +139 @@
         app/binutils
 endif
-
-## Networking
-#
-
-DIRS += \
-        srv/net/nil/eth \
-        srv/net/nil/nildummy
 
 ## Platform-specific hardware support
@@ -186 +187 @@
         lib/softfloat \
         lib/drv \
-        lib/packet \
         lib/fb \
         lib/net \
+        lib/nic \
         lib/ext2 \
         lib/usb \