Changeset 788 for soft

Timestamp:

Feb 10, 2016, 1:24:16 AM (9 years ago)

Author:

alain

Message:

Cosmetic

File:

• soft/giet_vm/Makefile (modified) (18 diffs)

soft/giet_vm/Makefile

@@ -226 +226 @@
 
 #####################################################
-### delete all binary files from Unix File System
-### and build a new virtual disk :
+### build a new virtual disk :
 ### - create the bin / misc / home directories 
 ### - create applications sub-directories
@@ -257 +256 @@
         mmd -o -i $(DISK_IMAGE) ::/misc              || true
         mmd -o -i $(DISK_IMAGE) ::/home              || true
+        mcopy -o -i $(DISK_IMAGE) images/lena_256.raw ::/misc
         mcopy -o -i $(DISK_IMAGE) images/images_128.raw ::/misc
         mcopy -o -i $(DISK_IMAGE) images/philips_1024.raw ::/misc
-        mcopy -o -i $(DISK_IMAGE) images/lena_256.raw ::/misc
         mcopy -o -i $(DISK_IMAGE) images/bridge_256.raw ::/misc
         mcopy -o -i $(DISK_IMAGE) images/couple_512.raw ::/misc
@@ -347 +346 @@
         $(LD) -o $@ -T giet_kernel/kernel.ld $(KERNEL_OBJS) -Lbuild/drivers -ldrivers
         $(DU) -D $@ > $@.txt
-        mdel -i $(DISK_IMAGE) ::/bin/kernel/kernel.elf   || true
-        mcopy -i $(DISK_IMAGE) build/kernel/kernel.elf ::/bin/kernel
+        mcopy -o -i $(DISK_IMAGE) build/kernel/kernel.elf ::/bin/kernel
 
 build/kernel/%.o: giet_kernel/%.c    \
@@ -386 +384 @@
 applications/classif/appli.elf: build/libs/libuser.a
         $(MAKE) -C applications/classif
-        mdel -i $(DISK_IMAGE) ::/bin/classif/appli.elf   || true
         mcopy -o -i $(DISK_IMAGE) applications/classif/appli.elf ::/bin/classif
 
@@ -395 +392 @@
 applications/convol/appli.elf: build/libs/libuser.a
         $(MAKE) -C applications/convol
-        mdel -i $(DISK_IMAGE) ::/bin/convol/appli.elf  || true
         mcopy -o -i $(DISK_IMAGE) applications/convol/appli.elf ::/bin/convol
 
@@ -403 +399 @@
 applications/coproc/appli.elf: build/libs/libuser.a
         $(MAKE) -C applications/coproc
-        mdel -i $(DISK_IMAGE) ::/bin/coproc/appli.elf  || true
         mcopy -o -i $(DISK_IMAGE) applications/coproc/appli.elf ::/bin/coproc
 
@@ -410 +405 @@
 applications/coremark/appli.elf: build/libs/libuser.a
         $(MAKE) -C applications/coremark
-        mdel -i $(DISK_IMAGE) ::/bin/coremark/appli.elf  || true
         mcopy -o -i $(DISK_IMAGE) applications/coremark/appli.elf ::/bin/coremark
 
@@ -419 +413 @@
 applications/dhrystone/appli.elf: build/libs/libuser.a
         $(MAKE) -C applications/dhrystone
-        mdel -i $(DISK_IMAGE) ::/bin/dhrystone/appli.elf  || true
         mcopy -o -i $(DISK_IMAGE) applications/dhtystone/appli.elf ::/bin/dhrystone
 
@@ -427 +420 @@
 applications/display/appli.elf: build/libs/libuser.a
         $(MAKE) -C applications/display
-        mdel -i $(DISK_IMAGE) ::/bin/display/appli.elf   || true
         mcopy -o -i $(DISK_IMAGE) applications/display/appli.elf ::/bin/display
 
@@ -435 +427 @@
 applications/gameoflife/appli.elf: build/libs/libuser.a
         $(MAKE) -C applications/gameoflife
-        mdel -i $(DISK_IMAGE) ::/bin/gameoflife/appli.elf   || true
         mcopy -o -i $(DISK_IMAGE) applications/gameoflife/appli.elf ::/bin/gameoflife
 
@@ -443 +434 @@
 applications/mjpeg/appli.elf: build/libs/libuser.a
         $(MAKE) -C applications/mjpeg
-        mdel -i $(DISK_IMAGE) ::/bin/mjpeg/appli.elf   || true
         mcopy -o -i $(DISK_IMAGE) applications/mjpeg/appli.elf ::/bin/mjpeg
 
@@ -451 +441 @@
 applications/ocean/appli.elf: build/libs/libmath.a  build/libs/libuser.a
         cd applications/ocean && $(MAKE) && cd ../..
-        mdel -i $(DISK_IMAGE) ::/bin/ocean/appli.elf   || true
         mcopy -o -i $(DISK_IMAGE) applications/ocean/appli.elf ::/bin/ocean
 
@@ -459 +448 @@
 applications/raycast/appli.elf: build/libs/libmath.a build/libs/libuser.a
         $(MAKE) -C applications/raycast
-        mdel -i $(DISK_IMAGE) ::/bin/raycast/appli.elf   || true
         mcopy -o -i $(DISK_IMAGE) applications/raycast/appli.elf ::/bin/raycast
 
@@ -467 +455 @@
 applications/rosenfeld/appli.elf: build/libs/libuser.a
         $(MAKE) -C applications/rosenfeld
-        mdel -i $(DISK_IMAGE) ::/bin/rosenfeld/appli.elf   || true
         mcopy -o -i $(DISK_IMAGE) applications/rosenfeld/appli.elf ::/bin/router
 
@@ -475 +462 @@
 applications/router/appli.elf: build/libs/libuser.a
         $(MAKE) -C applications/router
-        mdel -i $(DISK_IMAGE) ::/bin/router/appli.elf   || true
         mcopy -o -i $(DISK_IMAGE) applications/router/appli.elf ::/bin/router
 
@@ -483 +469 @@
 applications/shell/appli.elf: build/libs/libuser.a
         $(MAKE) -C applications/shell
-        mdel -i $(DISK_IMAGE) ::/bin/shell/appli.elf   || true
         mcopy -o -i $(DISK_IMAGE) applications/shell/appli.elf ::/bin/shell
 
@@ -491 +476 @@
 applications/sort/appli.elf: build/libs/libuser.a
         $(MAKE) -C applications/sort
-        mdel -i $(DISK_IMAGE) ::/bin/sort/appli.elf   || true
         mcopy -o -i $(DISK_IMAGE) applications/sort/appli.elf ::/bin/sort
 
@@ -499 +483 @@
 applications/transpose/appli.elf: build/libs/libuser.a
         $(MAKE) -C applications/transpose
-        mdel -i $(DISK_IMAGE) ::/bin/transpose/appli.elf   || true
         mcopy -o -i $(DISK_IMAGE) applications/transpose/appli.elf ::/bin/transpose