Changeset 41f7564 in mainline for boot/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:

• boot/Makefile (modified) (3 diffs)

boot/Makefile

@@ -30 +30 @@
 #
 
+-include ../version
 -include Makefile.config
 
-## Common flags
+## Paths
 #
 
@@ -38 +39 @@
 KERNELDIR = $(BASE)/kernel
 USPACEDIR = $(BASE)/uspace
-
-## Setup arch configuration
-#
-
--include arch/$(ARCH)/Makefile.inc
-
-ifeq ($(ARCH),xen32)
-        UARCH = ia32
-else
-        UARCH = $(ARCH)
-endif
 
 ifeq ($(CONFIG_DEBUG),y)
@@ -58 +48 @@
 endif
 
-.PHONY: all build config distclean arch_distclean clean kernel uspace clean_kernel clean_uspace distclean_kernel distclean_uspace
+.PHONY: all build config distclean clean generic_clean
 
 all:
-        tools/config.py default
-        $(MAKE) -C . build $(ARCH)
+        ../tools/config.py boot.config default $(ARCH) $(COMPILER) $(CONFIG_DEBUG) $(IMAGE)
+        $(MAKE) -C . build
+
+-include arch/$(ARCH)/Makefile.inc
 
 config:
-        tools/config.py
+        ../tools/config.py boot.config
 
-distclean: clean arch_distclean
+distclean: clean
         -rm Makefile.config
 
-kernel:
-        $(MAKE) -C $(KERNELDIR) NARCH=$(ARCH)
-
-uspace:
-        $(MAKE) -C $(USPACEDIR) NARCH=$(UARCH)
-
-clean_kernel:
-        $(MAKE) -C $(KERNELDIR) clean ARCH=$(ARCH)
-
-clean_uspace:
-        $(MAKE) -C $(USPACEDIR) clean ARCH=$(UARCH)
-
-clean_boot_gen:
+generic_clean:
         -rm generic/*.o genarch/*.o
-
-distclean_kernel:
-        $(MAKE) -C $(KERNELDIR) distclean ARCH=$(ARCH)
-
-distclean_uspace:
-        $(MAKE) -C $(USPACEDIR) distclean ARCH=$(UARCH)