w.i.p. move the livecd icon image out of the AROS dir and under Disks, and rename for consistency. invoke the icon target from the distfiles targets to make the correct icon for the built platform.

Author: Kalamatee

arch/i386-pc/boot/iso/mmakefile.src

@@ -9,7 +9,8 @@ TARGET_ISO := $(DISTDIR)/aros$(AROS_TARGET_SUFFIX)-pc-i386.iso
 #MM bootiso-pc-i386 :	AROS-complete		\
 #MM			kernel-package-pc-i386		\
 #MM			AROS-pc-drivers		\
-#MM			bootloader-$(AROS_TARGET_BOOTLOADER)-pc-i386
+#MM			bootloader-$(AROS_TARGET_BOOTLOADER)-pc-i386 \
+#MM         iconset-$(AROS_TARGET_ICONSET)-icons-aros-livecd
 
 bootiso-pc-i386: $(AROSDIR)/.backdrop $(TARGET_ISO)
 

arch/m68k-amiga/boot/iso/mmakefile.src

@@ -13,15 +13,17 @@ DEVEL_ISO  := $(DISTDIR)/aros$(AROS_TARGET_SUFFIX)-amiga-m68k-devel.iso
 #MM			kernel-package-amiga-m68k	\
 #MM			kernel-bootstrap-amiga-m68k	\
 #MM			AROS-amiga-m68k-drivers \
-#MM			bootdisk-amiga-m68k-gen
+#MM			bootdisk-amiga-m68k-gen \
+#MM         iconset-$(AROS_TARGET_ICONSET)-icons-aros-livecd
 
 #MM deviso-amiga-m68k :	AROS-complete		\
 #MM			kernel-aros \
 #MM			kernel-oop  \
 #MM			kernel-package-amiga-m68k	\
 #MM			kernel-bootstrap-amiga-m68k	\
 #MM			AROS-amiga-m68k-drivers \
-#MM			bootdisk-amiga-m68k-gen
+#MM			bootdisk-amiga-m68k-gen \
+#MM         iconset-$(AROS_TARGET_ICONSET)-icons-aros-livecd
 
 TAR ?= tar
 Q ?= @

boot/mmakefile.src

@@ -13,6 +13,8 @@ include $(SRCDIR)/config/aros.cfg
 
 #MM boot : boot-$(ARCH)-$(CPU)-$(AROS_TARGET_VARIANT) boot-$(ARCH)-$(CPU) boot-$(ARCH) boot-$(FAMILY)
 
+#MM distfiles-system : iconset-$(AROS_TARGET_ICONSET)-icons-aros-$(AROS_TARGET_ARCH)-system
+
 #MM
 distfiles-system:
 	%mkdir_q dir="$(DISTDIR)"

images/IconSets/Gorilla/Icons/Medium/AROS/mmakefile.src

@@ -14,7 +14,6 @@ ADDITIONALICONS := Demos \
 #MM- iconset-Gorilla-wbench-icons-clean : iconset-Gorilla-wbench-icons-aros-clean iconset-Gorilla-additional-icons-aros-clean
 #MM- iconset-Gorilla-wbench-icons : iconset-Gorilla-wbench-icons-aros
 #MM- iconset-Gorilla-wbench-icons : iconset-Gorilla-additional-icons-aros
-#MM iconset-Gorilla-wbench-icons-aros : iconset-Gorilla-wbench-icons-aros-livecd
 
 %build_icons mmake=iconset-Gorilla-wbench-icons-aros icons=$(BASEICONS) dir=$(AROSDIR)
 

images/IconSets/Gorilla/Icons/Medium/Disks/AROSHarddisk_Linux.info.src

@@ -0,0 +1 @@
+TYPE = DISK

images/IconSets/Gorilla/Icons/Medium/Disks/AROSHarddisk_Linux.png

@@ -0,0 +1 @@
+TYPE = DISK

images/IconSets/Gorilla/Icons/Medium/Disks/AROSHarddisk_MacOS.info.src

@@ -0,0 +1 @@
+TYPE = DISK

images/IconSets/Gorilla/Icons/Medium/Disks/AROSHarddisk_MacOS.png

@@ -9,3 +9,21 @@ ICONS := CDROM_Amiga Harddisk_Amiga Harddisk_Linux Harddisk_MacOS Harddisk_Windo
 #MM- themes-gorilla-icons : themes-gorilla-icons-disks
 %build_icons mmake=themes-gorilla-icons-disks icons=$(ICONS) \
              dir=$(AROS_CONTRIB)/Icons/Gorilla/Disks
+
+#MM
+iconset-Gorilla-icons-aros-livecd :
+	@$(ILBMTOICON) $(SRCDIR)/$(CURDIR)/CDROM_AROS.info.src $(SRCDIR)/$(CURDIR)/CDROM_AROS.png $(AROSDIR)/disk.info
+
+#MM
+iconset-Gorilla-icons-aros-linux-system :
+	@$(ILBMTOICON) $(SRCDIR)/$(CURDIR)/AROSHarddisk_Linux.info.src $(SRCDIR)/$(CURDIR)/AROSHarddisk_Linux.png $(AROSDIR)/disk.info
+
+#MM
+iconset-Gorilla-icons-aros-windows-system :
+	@$(ILBMTOICON) $(SRCDIR)/$(CURDIR)/AROSHarddisk_Windows.info.src $(SRCDIR)/$(CURDIR)/AROSHarddisk_Windows.png $(AROSDIR)/disk.info
+
+#MM
+iconset-Gorilla-icons-aros-darwin-system :
+	@$(ILBMTOICON) $(SRCDIR)/$(CURDIR)/AROSHarddisk_MacOS.info.src $(SRCDIR)/$(CURDIR)/AROSHarddisk_MacOS.png $(AROSDIR)/disk.info
+
+