Changeset 89c57b6 in mainline for uspace/Makefile

Timestamp:

2011-04-13T14:45:41Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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 \
         app/trace \
         app/top \
+        app/netecho \
+        app/nettest1 \
+        app/nettest2 \
+        app/ping \
+        app/websrv \
+        app/sysinfo \
         srv/clip \
         srv/devmap \
+        srv/devman \
         srv/loader \
         srv/ns \
@@ -66 +74 @@
         srv/hid/adb_mouse \
         srv/hid/char_mouse \
+        srv/hid/s3c24xx_ts \
         srv/hid/fb \
         srv/hid/kbd \
         srv/hw/char/i8042 \
-        srv/hw/netif/dp8390 \
-        srv/net/cfg \
+        srv/hw/char/s3c24xx_uart \
+        srv/hw/netif/ne2000 \
         srv/net/netif/lo \
         srv/net/il/arp \
@@ -78 +87 @@
         srv/net/tl/tcp \
         srv/net/net \
-        srv/net/netstart \
-        app/netecho \
-        app/nettest1 \
-        app/nettest2 \
-        app/ping
+        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
@@ -105 +107 @@
 
 ifeq ($(UARCH),amd64)
-        DIRS += srv/hw/bus/pci
+        DIRS += \
+                drv/rootpc \
+                drv/pciintel \
+                drv/isa \
+                drv/ns8250 \
+                srv/hw/irc/apic \
+                srv/hw/irc/i8259
 endif
 
 ifeq ($(UARCH),ia32)
-        DIRS += srv/hw/bus/pci
+        DIRS += \
+                drv/rootpc \
+                drv/pciintel \
+                drv/isa \
+                drv/ns8250 \
+                srv/hw/irc/apic \
+                srv/hw/irc/i8259
 endif
 
@@ -118 +132 @@
 ifeq ($(UARCH),sparc64)
         DIRS += \
-                srv/hw/cir/fhc \
-                srv/hw/cir/obio
+                srv/hw/irc/fhc \
+                srv/hw/irc/obio
 endif
 
@@ -132 +146 @@
         lib/softint \
         lib/softfloat \
-        lib/socket \
+        lib/drv \
+        lib/packet \
         lib/net
-
-ifeq ($(UARCH),amd64)
-        LIBS += lib/pci
-endif
-
-ifeq ($(UARCH),ia32)
-        LIBS += lib/pci
-endif
-
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))