Changeset ea28272 in mainline for uspace/Makefile

Timestamp:

2010-12-30T13:43:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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

@@ -38 +38 @@
         app/getterm \
         app/init \
+        app/kill \
         app/klog \
         app/mkfat \
@@ -53 +54 @@
         app/nettest2 \
         app/ping \
+        app/websrv \
+        app/sysinfo \
         srv/clip \
         srv/devmap \
@@ -85 +88 @@
         srv/net/tl/tcp \
         srv/net/net \
-        drv/root
+        drv/root \
+        drv/rootvirt \
+        drv/test1 \
+        drv/test2
 
 ## Networking
 #
 
-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
@@ -108 +108 @@
 
 ifeq ($(UARCH),amd64)
+        DIRS += drv/rootpc
+        DIRS += drv/pciintel
+        DIRS += drv/isa
+        DIRS += drv/ns8250
 endif
 
 ifeq ($(UARCH),ia32)
-        DIRS += drv/rootia32
+        DIRS += drv/rootpc
         DIRS += drv/pciintel
         DIRS += drv/isa