Changeset d7ff048 in mainline for uspace/Makefile

Timestamp:

2011-10-08T13:08:53Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bf08ff0

Parents:

8367d1d (diff), 80099c19 (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) (5 diffs)

uspace/Makefile

@@ -94 +94 @@
         srv/hw/char/i8042 \
         srv/hw/char/s3c24xx_uart \
-        srv/hw/netif/ne2000 \
-        srv/net/netif/lo \
         srv/net/il/arp \
         srv/net/il/ip \
@@ -101 +99 @@
         srv/net/tl/udp \
         srv/net/tl/tcp \
+        srv/net/nil/eth \
+        srv/net/nil/nildummy \
         srv/net/net \
         drv/infrastructure/root \
@@ -117 +117 @@
         drv/bus/usb/usbmid \
         drv/bus/usb/usbmouse \
-        drv/bus/usb/vhc
+        drv/bus/usb/vhc \
+        drv/nic/lo \
+        drv/nic/ne2k
 
 ifeq ($(CONFIG_PCC),y)
@@ -131 +133 @@
         app/binutils
 endif
-
-## Networking
-#
-
-DIRS += \
-        srv/net/nil/eth \
-        srv/net/nil/nildummy
 
 ## Platform-specific hardware support
@@ -186 +181 @@
         lib/softfloat \
         lib/drv \
-        lib/packet \
         lib/fb \
         lib/net \
+        lib/nic \
         lib/ext2 \
         lib/usb \