Changeset 647 for trunk/Makefile

Timestamp:

Oct 22, 2019, 1:48:51 PM (4 years ago)

Author:

alain

Message:

...miscelaneous...

File:

• trunk/Makefile (modified) (5 diffs)

trunk/Makefile

@@ -46 +46 @@
                 user/idbg/build/idbg.elf           \
                 user/sort/build/sort.elf           \
-        user/fft/build/fft.elf
+        user/fft/build/fft.elf             \
+        user/display/build/display.elf     \
+        user/convol/build/convol.elf       \
+        user/transpose/build/transpose.elf
+ 
 
 # Virtual disk path
@@ -61 +65 @@
 # when the corresponding sources files have been modified or destroyed.
 # The "home" directory on the virtual disk is not modified
-compile: dirs                              \
-         hard_config.h                     \
-         build_libs                        \
-         $(BOOTLOADER_PATH)/build/boot.elf \
-         kernel/build/kernel.elf           \
-         user/init/build/init.elf          \
-         user/ksh/build/ksh.elf            \
-         user/pgcd/build/pgcd.elf          \
-         user/idbg/build/idbg.elf          \
-         user/sort/build/sort.elf          \
-         user/fft/build/fft.elf            \
+compile: dirs                                \
+         hard_config.h                       \
+         build_libs                          \
+         $(BOOTLOADER_PATH)/build/boot.elf   \
+         kernel/build/kernel.elf             \
+         user/init/build/init.elf            \
+         user/ksh/build/ksh.elf              \
+         user/pgcd/build/pgcd.elf            \
+         user/idbg/build/idbg.elf            \
+         user/sort/build/sort.elf            \
+         user/fft/build/fft.elf              \
+         user/display/build/display.elf      \
+         user/convol/build/convol.elf        \
+         user/transpose/build/transpose.elf  \
          list
 
@@ -107 +114 @@
         $(MAKE) -C user/idbg clean
         $(MAKE) -C user/fft clean
+        $(MAKE) -C user/display clean
+        $(MAKE) -C user/convol clean
+        $(MAKE) -C user/transpose clean
         $(MAKE) -C $(HAL_ARCH) clean
 
@@ -119 +129 @@
         dd              if=$(DISK_IMAGE) of=temp.dmg count=65536
         mv              temp.dmg $(DISK_IMAGE)
-        mmd             -o -i $(DISK_IMAGE) ::/bin            || true
-        mmd             -o -i $(DISK_IMAGE) ::/bin/kernel     || true
-        mmd             -o -i $(DISK_IMAGE) ::/bin/user       || true
-        mmd             -o -i $(DISK_IMAGE) ::/home           || true
+        mmd             -o -i $(DISK_IMAGE) ::/bin                          || true
+        mmd             -o -i $(DISK_IMAGE) ::/bin/kernel                   || true
+        mmd             -o -i $(DISK_IMAGE) ::/bin/user                     || true
+        mmd             -o -i $(DISK_IMAGE) ::/home                         || true
+        mmd             -o -i $(DISK_IMAGE) ::/misc                         || true 
+        mcopy           -o -i $(DISK_IMAGE) images/lena_256.raw ::/misc     || true             
+        mcopy           -o -i $(DISK_IMAGE) images/images_128.raw ::/misc   || true             
+        mcopy           -o -i $(DISK_IMAGE) images/philips_1024.raw ::/misc || true             
         mdir                -/ -b -i $(DISK_IMAGE) ::/
 
@@ -194 +208 @@
         $(MAKE) -C user/fft
         mcopy -o -i $(DISK_IMAGE) $@ ::/bin/user
+user/display/build/display.elf: build_libs
+        $(MAKE) -C user/display
+        mcopy -o -i $(DISK_IMAGE) $@ ::/bin/user
+user/convol/build/convol.elf: build_libs
+        $(MAKE) -C user/convol
+        mcopy -o -i $(DISK_IMAGE) $@ ::/bin/user
+user/transpose/build/transpose.elf: build_libs
+        $(MAKE) -C user/transpose
+        mcopy -o -i $(DISK_IMAGE) $@ ::/bin/user