Changeset 827d73f in mainline for uspace/Makefile

Timestamp:

2010-02-12T14:09:22Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

a70bda4

Parents:

918e9910 (diff), e70edd1 (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:

Merged the actual head

File:

• uspace/Makefile (modified) (3 diffs)

uspace/Makefile

@@ -33 +33 @@
 
 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/char/i8042 \
-        srv/console \
+        srv/bd/part/guid_part \
+        srv/bd/part/mbr_part \
         srv/fs/fat \
         srv/fs/tmpfs \
         srv/fs/devfs \
-        srv/mouse/c_mouse \
-        srv/vfs \
-        srv/devmap \
-        srv/part/mbr_part \
-        srv/clip \
-        app/edit \
-        app/tetris \
-        app/tester \
-        app/trace \
-        app/klog \
-        app/init \
-        app/getterm \
-        app/redir \
-        app/bdsh \
+        srv/hid/adb_mouse \
+        srv/hid/console \
+        srv/hid/char_mouse \
+        srv/hid/fb \
+        srv/hid/kbd \
+        srv/hw/char/i8042 \
         srv/net
 
 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
 
@@ -81 +90 @@
         lib/libblock \
         lib/softint \
-        lib/softfloat
+        lib/softfloat \
+
+ifeq ($(UARCH),amd64)
+        LIBS += lib/libpci
+endif
+
+ifeq ($(UARCH),ia32)
+        LIBS += lib/libpci
+endif
+
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))
@@ -99 +117 @@
 
 $(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)