Changes in boot/arch/amd64/Makefile.inc [b3d513f:01a9ef5] in mainline

File:

• boot/arch/amd64/Makefile.inc (modified) (6 diffs, 1 prop)

boot/arch/amd64/Makefile.inc

@@ -33 +33 @@
         $(USPACEDIR)/srv/hw/char/i8042/i8042 \
         $(USPACEDIR)/srv/hw/bus/pci/pci \
-        $(USPACEDIR)/srv/hid/c_mouse/c_mouse
+        $(USPACEDIR)/srv/hid/char_mouse/char_ms
 
 MODULES := $(notdir $(COMPONENTS))
@@ -39 +39 @@
 build: $(BASE)/image.iso
 
-$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
+$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)
         mkdir -p $(TMP)/boot/grub
         cp arch/$(BARCH)/grub/stage2_eltorito $(TMP)/boot/grub/
@@ -56 +56 @@
         done
         
+        rm -f $(USPACEDIR)/dist/srv/*
+        rm -f $(USPACEDIR)/dist/app/*
+        rm -f $(USPACEDIR)/dist/cfg/net/*
+        
         cp $(KERNELDIR)/kernel.bin $(TMP)/boot/
         for task in $(INIT_TASKS) ; do \
@@ -65 +69 @@
         for file in $(RD_APPS) ; do \
                 cp $$file $(USPACEDIR)/dist/app/ ; \
+        done
+        for file in $(NET_CFG) ; do \
+                cp $$file $(USPACEDIR)/dist/cfg/net/ ; \
         done
         
@@ -78 +85 @@
 
 clean:
+        rm -f $(USPACEDIR)/dist/srv/*
+        rm -f $(USPACEDIR)/dist/app/*
+        rm -f $(USPACEDIR)/dist/cfg/net/*
+
         for file in $(RD_SRVS) ; do \
                 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
@@ -84 +95 @@
                 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
         done
+        for file in $(NET_CFG) ; do \
+                rm -f $(USPACEDIR)/dist/cfg/net/`basename $$file` ; \
+        done
         rm -fr $(TMP)
         rm -f $(BASE)/image.iso