Mercurial > hg > Members > kono > nitros9-code

changeset 2217:0e1b2536b299

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated macro names
author boisy
date Tue, 17 Mar 2009 10:33:48 +0000
parents d096a278e068
children 7ba4d9a816af
files level1/coco/makefile level1/d64/makefile level1/dalpha/makefile level2/coco3/makefile level2/coco3_6309/makefile
diffstat 5 files changed, 30 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/level1/coco/makefile	Tue Mar 17 02:52:57 2009 +0000
+++ b/level1/coco/makefile	Tue Mar 17 10:33:48 2009 +0000
@@ -53,7 +53,8 @@
 LDSK720K        = $(DISTRONAME)_80d.dsk
 
 
-ARCHIVE_DSKS	= $(DSKDW3COCO1) $(DSKDW3COCO2) $(DSK360K_1) $(DSK360K_2) $(DSK720K)
+DSKS		= $(DSKDW3COCO1) $(DSKDW3COCO2) $(DSK360K_1) $(DSK360K_2) $(DSK720K)
+LDSKS		= $(LDSKDW3COCO1) $(LDSKDW3COCO2) $(LDSK360K_1) $(LDSK360K_2) $(LDSK720K)
 
 # Make all components
 all:
@@ -69,21 +70,17 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSKDW3COCO1) $(DSKDW3COCO2) \
-	$(LDSKDW3COCO1) $(LDSKDW3COCO2) \
-	$(DSK360K_1) $(LDSK360K_1) \
-	$(DSK360K_2) $(LDSK360K_2) $(DSK720K) $(LDSK720K)
-
+	-$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
 
 dsk: all $(PACKAGENAME)
 
 dskcopy: dsk
-	$(CP) $(DSKDW3COCO1) $(DSKDW3COCO2) $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 scp: dsk
 	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
 
-$(PACKAGENAME): $(ARCHIVE_DSKS) ../../ReadMe ../../ChangeLog
+$(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog
 	$(ARCHIVE) $@ $^
 
 $(DSKDW3COCO1):
@@ -307,5 +304,5 @@
 
 info:
 	@echo "*** NitrOS-9/6809 Level 1 for the Tandy Color Computer ***" 
-	@$(foreach dsk, $(ARCHIVE_DSKS), $(ECHO) $(dsk);)
+	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)
 	
--- a/level1/d64/makefile	Tue Mar 17 02:52:57 2009 +0000
+++ b/level1/d64/makefile	Tue Mar 17 10:33:48 2009 +0000
@@ -105,7 +105,9 @@
 DSK180K_1	= $(DISTROVER)_40s_1.dsk
 DSK180K_2	= $(DISTROVER)_40s_2.dsk
 
-ARCHIVE_DSKS	= $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(DSK180K_1) $(DSK180K_2)
+DSKS		= $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(DSK180K_1) $(DSK180K_2)
+LDSKS		= $(LDSK360K_1) $(LDSK360K_2) $(LDSK720K) $(LDSK180K_1) $(LDSK180K_2)
+
 # Make all components
 all:
 	@$(ECHO) "**************************************************"
@@ -120,20 +122,17 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 	
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSK360K_1) $(LDSK360K_1) \
-	$(DSK360K_2) $(LDSK360K_2) $(DSK720K) $(LDSK720K) \
-	$(DSK180K_1) $(DSK180K_2) 
-
+	-$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
 
 dsk: all $(PACKAGENAME)
 
 dskcopy: dsk
-	$(CP) $(ARCHIVE_DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 scp: dsk
 	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
 
-$(PACKAGENAME): $(ARCHIVE_DSKS) ../../ReadMe ../../ChangeLog
+$(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog
 	$(ARCHIVE) $@ $^
 
 #Dragon 64/32+
@@ -275,4 +274,4 @@
 
 info:
 	@$(ECHO) "*** NitrOS-9/6809 Level 1 for the Dragon 64 ***"
-	@$(foreach dsk, $(ARCHIVE_DSKS), $(ECHO) $(dsk);)
+	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)
--- a/level1/dalpha/makefile	Tue Mar 17 02:52:57 2009 +0000
+++ b/level1/dalpha/makefile	Tue Mar 17 10:33:48 2009 +0000
@@ -97,7 +97,7 @@
 DSK720K         = $(DISTROVER)_80d.dsk
 LDSK720K        = $(DISTRONAME)_80d.dsk
 
-ARCHIVE_DSKS	= $(DSK360K_1) $(DSK360K_2) $(DSK720K)
+DSKS		= $(DSK360K_1) $(DSK360K_2) $(DSK720K)
 
 # Make all components
 all:
@@ -113,20 +113,17 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 	
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSK360K_1) $(LDSK360K_1) \
-	$(DSK360K_2) $(LDSK360K_2) $(DSK720K) $(LDSK720K) \
-	
-
+	-$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
 
 dsk: all $(PACKAGENAME)
 
 dskcopy: dsk
-	$(CP) $(ARCHIVE_DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 scp: dsk
 	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
 
-$(PACKAGENAME): $(ARCHIVE_DSKS) ../../ReadMe ../../ChangeLog
+$(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog
 	$(ARCHIVE) $@ $^
 
 #Dragon Alpha internal drives are Single sided 80 track
@@ -241,4 +238,4 @@
 
 info:
 	@$(ECHO) "*** NitrOS-9/6809 Level 1 for the Dragon Alpha ***"
-	@$(foreach dsk, $(ARCHIVE_DSKS), $(ECHO) $(dsk);)
+	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)
--- a/level2/coco3/makefile	Tue Mar 17 02:52:57 2009 +0000
+++ b/level2/coco3/makefile	Tue Mar 17 10:33:48 2009 +0000
@@ -49,7 +49,8 @@
 LDSK720K_50HZ	= $(DISTRONAME)_80d_50hz.dsk
 TESTDSK		= test.dsk
 
-ARCHIVE_DSKS	= $(DSKDW3) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ)
+DSKS		= $(DSKDW3) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ)
+LDSKS		= $(LDSKDW3) $(LDSK360K_1) $(LDSK360K_1_50HZ) $(LDSK360K_2) $(LDSK720K) $(LDSK720K_50HZ)
 
 # Make all components
 all:
@@ -65,20 +66,17 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSKDW3) $(DSK360K_1) $(LDSK360K_1) \
-	$(DSK360K_1_50HZ) $(LDSK360K_1_50HZ) \
-	$(DSK360K_2) $(LDSK360K_2) \
-	$(DSK720K) $(LDSK720K) $(DSK720K_50HZ) $(LDSK720K_50HZ)
+	-$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
 
 dsk: all $(PACKAGENAME)
 
 dskcopy: dsk
-	$(CP) $(ARCHIVE_DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 scp: dsk
 	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
 
-$(PACKAGENAME): $(ARCHIVE_DSKS) ../../ReadMe ../../ChangeLog
+$(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog
 	$(ARCHIVE) $@ $^
 
 $(DSKDW3):
@@ -332,4 +330,4 @@
 
 info:
 	@$(ECHO) "*** NitrOS-9/6809 Level 2 for the Tandy Color Computer 3 ***"
-	@$(foreach dsk, $(ARCHIVE_DSKS), $(ECHO) $(dsk);)
+	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)
--- a/level2/coco3_6309/makefile	Tue Mar 17 02:52:57 2009 +0000
+++ b/level2/coco3_6309/makefile	Tue Mar 17 10:33:48 2009 +0000
@@ -49,7 +49,8 @@
 LDSK720K_50HZ	= $(DISTRONAME)_80d_50hz.dsk
 TESTDSK		= test.dsk
 
-ARCHIVE_DSKS	= $(DSKDW3) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ)
+DSKS		= $(DSKDW3) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ)
+LDSKS		= $(LDSKDW3) $(LDSK360K_1) $(LDSK360K_1_50HZ) $(LDSK360K_2) $(LDSK720K) $(LDSK720K_50HZ)
 
 # Make all components
 all:
@@ -65,20 +66,17 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSKDW3) $(DSK360K_1) $(LDSK360K_1) \
-	$(DSK360K_1_50HZ) $(LDSK360K_1_50HZ) \
-	$(DSK360K_2) $(LDSK360K_2) \
-	$(DSK720K) $(LDSK720K) $(DSK720K_50HZ) $(LDSK720K_50HZ)
+	-$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
 
 dsk: all $(PACKAGENAME)
 
 dskcopy: dsk
-	$(CP) $(ARCHIVE_DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 scp: dsk
 	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
 
-$(PACKAGENAME): $(ARCHIVE_DSKS) ../../ReadMe ../../ChangeLog
+$(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog
 	$(ARCHIVE) $@ $^
 
 $(DSKDW3):
@@ -332,4 +330,4 @@
 
 info:
 	@$(ECHO) "*** NitrOS-9/6309 Level 2 for the Tandy Color Computer 3 ***"
-	@$(foreach dsk, $(ARCHIVE_DSKS), $(ECHO) $(dsk);)
+	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)