Changeset 43c3937 in mainline for uspace/Makefile

Timestamp:

2011-01-07T10:43:15Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

5097bed4

Parents:

5f7d96e (diff), 0f191a2 (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 with usb/development

File:

• uspace/Makefile (modified) (4 diffs)

uspace/Makefile

@@ -38 +38 @@
         app/getterm \
         app/init \
+        app/kill \
+        app/killall \
         app/klog \
         app/mkfat \
@@ -55 +57 @@
         app/nettest2 \
         app/ping \
+        app/websrv \
         app/sysinfo \
         srv/clip \
@@ -80 +83 @@
         srv/hw/char/s3c24xx_uart \
         srv/hw/netif/dp8390 \
-        srv/net/cfg \
         srv/net/netif/lo \
         srv/net/il/arp \
@@ -96 +98 @@
 #
 
-ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
-        LIBN = \
-                srv/net/nil/eth \
-                srv/net/nil/nildummy
-else
-        DIRS += \
-                srv/net/nil/eth \
-                srv/net/nil/nildummy
-endif
+DIRS += \
+        srv/net/nil/eth \
+        srv/net/nil/nildummy
 
 ## Platform-specific hardware support