Changeset 46c20c8 in mainline for uspace/Makefile

Timestamp:

2010-11-26T20:08:10Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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) (5 diffs)

uspace/Makefile

@@ -27 +27 @@
 #
 
-## Include configuration
+-include ../Makefile.common
+-include ../Makefile.config
+
+## Common binaries
 #
-
--include ../Makefile.config
 
 DIRS = \
@@ -40 +41 @@
         app/mkfat \
         app/redir \
+        app/sbi \
+        app/stats \
         app/taskdump \
+        app/tasks \
         app/tester \
         app/tetris \
         app/trace \
+        app/top \
+        app/netecho \
+        app/nettest1 \
+        app/nettest2 \
+        app/ping \
         srv/clip \
         srv/devmap \
+        srv/devman \
         srv/loader \
         srv/ns \
@@ -60 +70 @@
         srv/fs/devfs \
         srv/hid/adb_mouse \
-        srv/hid/console \
         srv/hid/char_mouse \
+        srv/hid/s3c24xx_ts \
         srv/hid/fb \
         srv/hid/kbd \
-        srv/hw/char/i8042
+        srv/hw/char/i8042 \
+        srv/hw/char/s3c24xx_uart \
+        srv/hw/netif/dp8390 \
+        srv/net/cfg \
+        srv/net/netif/lo \
+        srv/net/il/arp \
+        srv/net/il/ip \
+        srv/net/tl/icmp \
+        srv/net/tl/udp \
+        srv/net/tl/tcp \
+        srv/net/net \
+        drv/root
+
+## 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
+
+## Platform-specific hardware support
+#
+
+ifneq ($(UARCH),abs32le)
+        DIRS += srv/hid/console
+endif
 
 ifeq ($(UARCH),amd64)
-        DIRS += srv/hw/bus/pci
 endif
 
 ifeq ($(UARCH),ia32)
-        DIRS += srv/hw/bus/pci
+        DIRS += drv/rootia32
+        DIRS += drv/pciintel
+        DIRS += drv/isa
+        DIRS += drv/ns8250
 endif
 
@@ -84 +127 @@
 endif
 
-LIBC = lib/libc
+## System libraries
+#
+
+LIBC = lib/c
 LIBS = \
-        lib/libfs \
-        lib/libblock \
+        lib/fs \
+        lib/block \
+        lib/clui \
         lib/softint \
         lib/softfloat \
-
-ifeq ($(UARCH),amd64)
-        LIBS += lib/libpci
-endif
-
-ifeq ($(UARCH),ia32)
-        LIBS += lib/libpci
-endif
-
+        lib/drv \
+        lib/packet \
+        lib/net
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))
 LIBS_BUILD = $(addsuffix .build,$(LIBS))
+LIBN_BUILD = $(addsuffix .build,$(LIBN))
+BUILDS := $(addsuffix .build,$(DIRS))
 
-BUILDS := $(addsuffix .build,$(DIRS))
-CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
+CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBN)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
 
-.PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(BUILDS) $(CLEANS) clean
+.PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD) $(BUILDS) $(CLEANS) clean
 
 all: $(BUILDS)
@@ -115 +157 @@
         -$(MAKE) -C $(basename $@) clean
 
-$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
+$(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD)
+        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
+
+$(LIBN_BUILD): $(LIBC_BUILD) $(LIBS_BUILD)
         $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)