Changeset 04803bf in mainline for boot/Makefile

Timestamp:

2011-03-21T22:00:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• boot/Makefile (modified) (1 diff)

boot/Makefile

@@ -27 +27 @@
 #
 
-## Include configuration
-#
+.PHONY: all build_dist build_comps clean_dist clean
 
--include ../Makefile.config
--include ../config.defs
+include Makefile.common
 
-## Paths
-#
+all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(PREBUILD)
+        $(MAKE) -f $(BUILD) PRECHECK=$(PRECHECK)
+ifneq ($(POSTBUILD),)
+        $(MAKE) -f $(POSTBUILD) PRECHECK=$(PRECHECK)
+endif
 
-BASE = ..
-KERNELDIR = $(BASE)/kernel
-USPACEDIR = $(BASE)/uspace
+build_comps: $(COMPONENTS) $(LINK).in
+        $(PACK) $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) arch/$(KARCH) $(COMPONENTS)
 
-.PHONY: all build clean generic_clean
+$(INITRD).img: $(INITRD).fs
+        $(MKHORD) $(PAGE_SIZE) $< $@
 
-all: ../Makefile.config ../config.h ../config.defs build
+$(INITRD).fs: build_dist
+ifeq ($(RDFMT),tmpfs)
+        $(MKTMPFS) $(DIST_PATH) $@
+endif
+ifeq ($(RDFMT),fat)
+        $(MKFAT) 1048576 $(DIST_PATH) $@
+endif
 
--include arch/$(BARCH)/Makefile.inc
+build_dist: clean_dist
+        for file in $(RD_SRVS) ; do \
+                cp "$$file" "$(DIST_PATH)/srv/" ; \
+        done
+        for file in $(RD_LIBS) ; do \
+                cp "$$file" "$(DIST_PATH)/lib/" ; \
+        done
+        for file in $(RD_APPS) ; do \
+                cp "$$file" "$(DIST_PATH)/app/" ; \
+        done
+        for file in $(NET_CFG) ; do \
+                cp "$$file" "$(DIST_PATH)/cfg/net/" ; \
+        done
+        for drv in $(RD_DRVS) ; do \
+                mkdir -p "$(DIST_PATH)/$(DRVS_PATH)/$$drv" ; \
+                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv/$$drv" "$(DIST_PATH)/$(DRVS_PATH)/$$drv/$$drv" ; \
+                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv/$$drv.ma" "$(DIST_PATH)/$(DRVS_PATH)/$$drv/$$drv.ma" ; \
+        done
+        for file in $(RD_DRV_CFG) ; do \
+                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file" "$(DIST_PATH)/$(DRVS_PATH)/$$file" ; \
+        done
+        
+clean: clean_dist
+        $(MAKE) -f $(BUILD) clean PRECHECK=$(PRECHECK)
+ifneq ($(POSTBUILD),)
+        $(MAKE) -f $(POSTBUILD) clean PRECHECK=$(PRECHECK)
+endif
+        rm -fr $(SANDBOX)
+        rm -f $(POST_OUTPUT) $(BOOT_OUTPUT) $(DEPEND) $(DEPEND_PREV) arch/*/include/common.h
+        find generic/src/ arch/*/src/ genarch/src/ -name '*.o' -follow -exec rm \{\} \;
 
-generic_clean:
-        -rm generic/*.o genarch/*.o
+clean_dist:
+        rm -f $(INITRD).fs $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
+        rm -f $(USPACE_PATH)/dist/srv/*
+        rm -rf $(USPACE_PATH)/dist/drv/*
+        rm -f $(USPACE_PATH)/dist/lib/*
+        rm -f $(USPACE_PATH)/dist/app/*
+        rm -f $(USPACE_PATH)/dist/cfg/net/*