[Lunar-commits] CVS: lunar-iso Makefile,1.9,1.10

[Auke Kok]

Update of /var/cvs/lunar/lunar-iso
In directory espresso.foo-projects.org:/tmp/cvs-serv13221

Modified Files:
	Makefile 
Log Message:
Mass commit all my latest changes !!! =^DDDDD


Index: Makefile
===================================================================
RCS file: /var/cvs/lunar/lunar-iso/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile	3 Feb 2005 21:04:04 -0000	1.9
+++ Makefile	13 Mar 2005 16:04:20 -0000	1.10
@@ -13,7 +13,7 @@
 # define the location where the ISO will be generated
 ISO_TARGET = $(ISO_SOURCE)/BUILD
 
-export ISO_SOURCE ISO_TARGET ISO_VERSION ISO_CODENAME ISO_DATE ISO_CNAME ISO_KVER ISO_KREL ISO_LUNAR_MODULE
+export ISO_SOURCE ISO_TARGET ISO_VERSION ISO_CODENAME ISO_DATE ISO_CNAME ISO_KVER ISO_PVER ISO_LUNAR_MODULE
 
 all: iso
 
@@ -22,11 +22,19 @@
 	@echo "Generating .iso file"
 	@scripts/isofs
 
-isolinux: proper initrd kernels memtest $(ISO_TARGET)/isolinux
+isolinux: proper kernels memtest $(ISO_TARGET)/isolinux
 $(ISO_TARGET)/isolinux:
 	@echo "Generating isolinux files"
 	@scripts/isolinux
 
+proper: aaa_dev aaa_base $(ISO_TARGET)/.proper
+$(ISO_TARGET)/.proper:
+	@echo "Cleaning BUILD"
+	@scripts/proper
+
+aaa_dev: $(ISO_SOURCE)/aaa_dev/aaa_dev.tar.bz2
+$(ISO_SOURCE)/aaa_dev/aaa_dev.tar.bz2: initrd
+
 initrd: discover $(ISO_SOURCE)/initrd/initrd
 $(ISO_SOURCE)/initrd/initrd:
 	@echo "Generating initrd image"
@@ -37,8 +45,8 @@
 	@echo "Generating static discover"
 	@scripts/discover
 
-kernels: $(ISO_TARGET)/.kernels
-$(ISO_TARGET)/.kernels:
+kernels: $(ISO_SOURCE)/kernels/.kernels
+$(ISO_SOURCE)/kernels/.kernels:
 	@echo "Building precompiled kernels"
 	@scripts/kernels
 
@@ -47,13 +55,8 @@
 	@echo "Generating memtest boot image"
 	@scripts/memtest
 
-proper: aaa_base $(ISO_TARGET)/.proper
-$(ISO_TARGET)/.proper:
-	@echo "Cleaning BUILD"
-	@scripts/proper
-
-aaa_base: rebuild $(ISO_TARGET)/var/cache/lunar/aaa_base.tar.bz2
-$(ISO_TARGET)/var/cache/lunar/aaa_base.tar.bz2:
+aaa_base: rebuild $(ISO_SOURCE)/aaa_base/aaa_base.tar.bz2
+$(ISO_SOURCE)/aaa_base/aaa_base.tar.bz2:
 	@echo "Creating aaa_base.tar.bz2"
 	@scripts/aaa_base