Changeset 59ecd4a in mainline for uspace/Makefile

Timestamp:

2010-04-04T21:41:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5db9084

Parents:

36a75a2 (diff), ee7e82a9 (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) (6 diffs)

uspace/Makefile

@@ -41 +41 @@
         app/mkfat \
         app/redir \
+        app/sbi \
         app/taskdump \
         app/tester \
@@ -64 +65 @@
         srv/hid/fb \
         srv/hid/kbd \
-        srv/hw/char/i8042
+        srv/hw/char/i8042 \
+        srv/hw/netif/dp8390
 
 ## Platform-specific hardware support
@@ -94 +96 @@
 #
 
-ifeq ($(CONFIG_NETIF_DP8390),y)
-        DIRS += srv/net/netif/dp8390
-endif
-
 NETWORKING_COMMON = \
         srv/net/netif/lo \
@@ -103 +101 @@
         srv/net/nil/nildummy \
         srv/net/net \
-        srv/net/net/start \
-        srv/net/socket \
-        srv/net/app/echo \
-        srv/net/app/ping \
-        srv/net/app/nettest1 \
-        srv/net/app/nettest2
+        srv/net/netstart \
+        app/netecho \
+        app/nettest1 \
+        app/nettest2 \
+        app/ping
 
 NETWORKING_MODULAR = \
@@ -127 +124 @@
         lib/softint \
         lib/softfloat \
+        lib/socket \
+        lib/net \
+        lib/netif
 
 ifeq ($(UARCH),amd64)
@@ -148 +148 @@
 endif
 
-ifeq ($(CONFIG_NETWORKING),none)
-        BUILDS := $(addsuffix .build,$(DIRS))
-endif
-
 CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(NETWORKING_COMMON)) $(addsuffix .clean,$(NETWORKING_MODULAR)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))