Changes in boot/Makefile [63920b0:cc1a727] in mainline

File:

• boot/Makefile (modified) (3 diffs)

boot/Makefile

@@ -40 +40 @@
         $(PACK) $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) arch/$(KARCH) $(COMPONENTS)
 
-$(INITRD).img: build_dist
+$(INITRD).img: $(INITRD).fs
+        $(MKHORD) $(PAGE_SIZE) $< $@
+
+$(INITRD).fs: build_dist
 ifeq ($(RDFMT),tmpfs)
         $(MKTMPFS) $(DIST_PATH) $@
@@ -58 +61 @@
                 cp "$$file" "$(DIST_PATH)/lib/" ; \
         done
-ifeq ($(CONFIG_DEVEL_FILES), y)
-        mkdir "$(DIST_PATH)/inc/c/"
-        cp -r -L "$(USPACE_PATH)/lib/c/include/." "$(DIST_PATH)/inc/c/"
-        cat "$(USPACE_PATH)/lib/c/arch/$(UARCH)/_link.ld" | sed 's/^STARTUP(.*)$$//g' > "$(DIST_PATH)/inc/_link.ld"
-endif
         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 \
@@ -89 +90 @@
 
 clean_dist:
-        rm -f $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
+        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 -rf $(USPACE_PATH)/dist/inc/*
         rm -f $(USPACE_PATH)/dist/app/*
         rm -f $(USPACE_PATH)/dist/cfg/net/*