Changeset f2b3d3e in mainline for uspace/Makefile

Timestamp:

2012-05-04T10:57:48Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

35a35651

Parents:

90924df (diff), d21e935c (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

@@ -42 +42 @@
         app/getterm \
         app/init \
+        app/inetcfg \
         app/kill \
         app/killall \
@@ -70 +71 @@
         app/sysinfo \
         app/mkbd \
-        srv/clip \
+        srv/clipboard \
         srv/loc \
         srv/devman \
         srv/loader \
+        srv/net/ethip \
+        srv/net/inet \
+        srv/net/loopip \
+        srv/net/tcp \
+        srv/net/udp \
         srv/ns \
         srv/taskmon \
@@ -96 +102 @@
         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 \
@@ -122 +120 @@
         drv/bus/usb/usbmid \
         drv/bus/usb/vhc \
-        drv/nic/lo \
         drv/nic/ne2k \
         drv/nic/e1k \