Changeset 371bd7d in mainline for uspace/Makefile

Timestamp:

2010-03-27T09:22:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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) (2 diffs)

uspace/Makefile

@@ -27 +27 @@
 #
 
-## Include configuration
+-include ../Makefile.common
+-include ../Makefile.config
+
+## Common binaries
 #
 
--include ../Makefile.config
-
 DIRS = \
+        app/bdsh \
+        app/edit \
+        app/getterm \
+        app/init \
+        app/klog \
+        app/mkfat \
+        app/redir \
+        app/taskdump \
+        app/tester \
+        app/tetris \
+        app/trace \
+        srv/clip \
+        srv/devmap \
+        srv/loader \
+        srv/ns \
+        srv/taskmon \
+        srv/vfs \
         srv/bd/ata_bd \
         srv/bd/file_bd \
         srv/bd/gxe_bd \
         srv/bd/rd \
-        srv/ns \
-        srv/loader \
-        srv/fb \
-        srv/kbd \
-        srv/console \
+        srv/bd/part/guid_part \
+        srv/bd/part/mbr_part \
         srv/fs/fat \
         srv/fs/tmpfs \
         srv/fs/devfs \
-        srv/vfs \
-        srv/devmap \
-        srv/part/mbr_part \
-        app/edit \
-        app/tetris \
-        app/tester \
-        app/trace \
-        app/klog \
-        app/init \
-        app/getvc \
-        app/redir \
-        app/bdsh
+        srv/hid/adb_mouse \
+        srv/hid/char_mouse \
+        srv/hid/fb \
+        srv/hid/kbd \
+        srv/hw/char/i8042
+
+## Platform-specific hardware support
+#
+
+ifneq ($(UARCH),abs32le)
+        DIRS += srv/hid/console
+endif
 
 ifeq ($(UARCH),amd64)
-        DIRS += srv/pci
+        DIRS += srv/hw/bus/pci
 endif
 
 ifeq ($(UARCH),ia32)
-        DIRS += srv/pci
+        DIRS += srv/hw/bus/pci
+endif
+
+ifeq ($(UARCH),ppc32)
+        DIRS += srv/hw/bus/cuda_adb
 endif
 
 ifeq ($(UARCH),sparc64)
         DIRS += \
-                srv/cir/fhc \
-                srv/cir/obio
+                srv/hw/cir/fhc \
+                srv/hw/cir/obio
 endif
 
-LIBC = lib/libc
+## Networking
+#
+
+ifeq ($(CONFIG_NETIF_DP8390),y)
+        DIRS += srv/net/netif/dp8390
+endif
+
+NETWORKING_COMMON = \
+        srv/net/netif/lo \
+        srv/net/nil/eth \
+        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
+
+NETWORKING_MODULAR = \
+        srv/net/il/arp \
+        srv/net/il/ip \
+        srv/net/tl/icmp \
+        srv/net/tl/udp \
+        srv/net/tl/tcp
+
+## System libraries
+#
+
+LIBC = lib/c
 LIBS = \
-        lib/libfs \
-        lib/libblock \
+        lib/fs \
+        lib/block \
         lib/softint \
-        lib/softfloat
+        lib/softfloat \
+
+ifeq ($(UARCH),amd64)
+        LIBS += lib/pci
+endif
+
+ifeq ($(UARCH),ia32)
+        LIBS += lib/pci
+endif
+
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))
 LIBS_BUILD = $(addsuffix .build,$(LIBS))
 
-BUILDS := $(addsuffix .build,$(DIRS))
-CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
+ifeq ($(CONFIG_NETWORKING),modular)
+        BUILDS := $(addsuffix .build,$(DIRS)) $(addsuffix .build,$(NETWORKING_COMMON)) $(addsuffix .build,$(NETWORKING_MODULAR))
+endif
+
+ifeq ($(CONFIG_NETWORKING),module)
+        BUILDS := $(addsuffix .build,$(DIRS)) $(addsuffix .build,$(NETWORKING_COMMON))
+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))
 
 .PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(BUILDS) $(CLEANS) clean
@@ -95 +163 @@
 
 $(BUILDS): $(LIBC_BUILD) $(LIBS_BUILD)
-        $(MAKE) -C $(basename $@) all
+        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
 
 $(LIBS_BUILD): $(LIBC_BUILD)
-        $(MAKE) -C $(basename $@) all
+        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)
 
 $(LIBC_BUILD):
-        $(MAKE) -C $(basename $@) all
+        $(MAKE) -C $(basename $@) all PRECHECK=$(PRECHECK)