Changeset 41f7564 in mainline for uspace/Makefile

Timestamp:

2006-07-17T00:53:53Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

231fcb2

Parents:

41c4444

Message:

cleanup and unify the build system

File:

• uspace/Makefile (modified) (3 diffs)

uspace/Makefile

@@ -30 +30 @@
 #
 
+-include ../version
 -include Makefile.config
 
@@ -48 +49 @@
         DIRS += pci
 endif
+
 ifeq ($(ARCH), ia32)
         DIRS += pci
 endif
 
-CFLAGS += -DCONFIG_MIPS_FPU
+ifeq ($(ARCH), mips32)
+        CFLAGS += -DCONFIG_MIPS_FPU
+endif
+
+ifeq ($(ARCH), mips32eb)
+        CFLAGS += -DCONFIG_MIPS_FPU
+endif
 
 BUILDS := $(addsuffix .build,$(DIRS))
@@ -60 +68 @@
 
 all:
-        tools/config.py default $(NARCH)
-ifdef NARCH
- ifneq ($(ARCH), $(NARCH))
-        $(MAKE) -C . clean
- endif
-endif
+        ../tools/config.py uspace.config default $(ARCH) $(COMPILER) $(CONFIG_DEBUG)
         $(MAKE) -C . build
 
 config:
-        tools/config.py
+        ../tools/config.py uspace.config
 
 build: $(BUILDS)