Changeset ad7a6c9 in mainline for uspace/Makefile

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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

@@ -38 +38 @@
         app/getterm \
         app/init \
+        app/kill \
+        app/killall \
         app/klog \
         app/mkfat \
@@ -44 +46 @@
         app/stats \
         app/taskdump \
-        app/tasks \
         app/tester \
         app/tetris \
@@ -53 +54 @@
         app/nettest2 \
         app/ping \
+        app/websrv \
+        app/sysinfo \
         srv/clip \
         srv/devmap \
@@ -76 +79 @@
         srv/hw/char/i8042 \
         srv/hw/char/s3c24xx_uart \
-        srv/hw/netif/dp8390 \
-        srv/net/cfg \
+        srv/hw/netif/ne2000 \
         srv/net/netif/lo \
         srv/net/il/arp \
@@ -93 +95 @@
 #
 
-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
@@ -111 +107 @@
 
 ifeq ($(UARCH),amd64)
-        DIRS += drv/rootpc
-        DIRS += drv/pciintel
-        DIRS += drv/isa
-        DIRS += drv/ns8250
+        DIRS += \
+                drv/rootpc \
+                drv/pciintel \
+                drv/isa \
+                drv/ns8250 \
+                srv/hw/irc/apic \
+                srv/hw/irc/i8259
 endif
 
 ifeq ($(UARCH),ia32)
-        DIRS += drv/rootpc
-        DIRS += drv/pciintel
-        DIRS += drv/isa
-        DIRS += drv/ns8250
+        DIRS += \
+                drv/rootpc \
+                drv/pciintel \
+                drv/isa \
+                drv/ns8250 \
+                srv/hw/irc/apic \
+                srv/hw/irc/i8259
 endif
 
@@ -130 +132 @@
 ifeq ($(UARCH),sparc64)
         DIRS += \
-                srv/hw/cir/fhc \
-                srv/hw/cir/obio
+                srv/hw/irc/fhc \
+                srv/hw/irc/obio
 endif