Mercurial > hg > Members > kono > nitros9-code

changeset 3053:22122ff8bef3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
level 2/3 makefiles: Cosmetic/whitespace changes Basically making level 2 and 3 versions more similar. Eventually they should be merged to avoid unnecessary divergence.
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 25 Jan 2015 22:36:01 +0100
parents 39bca9937f7b
children 22ddd48b4ec2
files level2/coco3/makefile level2/coco3/modules/makefile level2/makefile level3/coco3/makefile level3/coco3/modules/makefile
diffstat 5 files changed, 73 insertions(+), 67 deletions(-) [+]
line wrap: on
line diff
--- a/level2/coco3/makefile	Sun Jan 25 22:36:00 2015 +0100
+++ b/level2/coco3/makefile	Sun Jan 25 22:36:01 2015 +0100
@@ -1,6 +1,7 @@
 ifeq ($(CPU),)
-        CPU=6809
+    CPU = 6809
 endif
+
 PORT = coco3
 MACHINE = Tandy Color Computer 3
 include $(NITROS9DIR)/rules.mak
@@ -115,7 +116,7 @@
 
 $(DSKBECKER):
 	$(RM) $@
-	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
 	$(OS9GEN) $@ -b=$(BOOTFILE_BECKER) -t=$(KERNELFILE_BECKER)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -169,7 +170,7 @@
 
 $(DSKARDUINO):
 	$(RM) $@
-	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
 	$(OS9GEN) $@ -b=$(BOOTFILE_ARDUINO) -t=$(KERNELFILE_ARDUINO)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -223,7 +224,7 @@
 
 $(DSKCOCOSDC):
 	$(RM) $@
-	$(OS9FORMAT) -t1024 -q $@ -n"NitrOS-9/$(CPU) Level 2"
+	$(OS9FORMAT) -t1024 -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
 	$(OS9GEN) $@ -b=$(BOOTFILE_COCOSDC) -t=$(KERNELFILE_COCOSDC)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -277,7 +278,7 @@
 
 $(DSKDW):
 	$(RM) $@
-	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
 	$(OS9GEN) $@ -b=$(BOOTFILE_DW) -t=$(KERNELFILE_DW)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -331,7 +332,7 @@
 
 $(DSKDWHEADLESS):
 	$(RM) $@
-	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
 	$(OS9GEN) $@ -b=$(BOOTFILE_DWHEADLESS) -t=$(KERNELFILE_DW)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -385,7 +386,7 @@
 
 $(DSKBECKERHEADLESS):
 	$(RM) $@
-	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
 	$(OS9GEN) $@ -b=$(BOOTFILE_BECKER_HEADLESS) -t=$(KERNELFILE_BECKER)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -439,7 +440,7 @@
 
 $(DSKARDUINOHEADLESS):
 	$(RM) $@
-	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
 	$(OS9GEN) $@ -b=$(BOOTFILE_ARDUINO_HEADLESS) -t=$(KERNELFILE_ARDUINO)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -493,7 +494,7 @@
 
 $(DSK360K_1):
 	$(RM) $@
-	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 1"
+	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL) Disk 1"
 	$(OS9GEN) $@ -b=$(BOOTFILE_40D) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -516,7 +517,7 @@
 
 $(DSK360K_1_50HZ):
 	$(RM) $@
-	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 1"
+	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL) Disk 1"
 	$(OS9GEN) $@ -b=$(BOOTFILE_40D_50HZ) -t=$(KERNELFILE_50HZ)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -539,7 +540,7 @@
 
 $(DSK360K_2):
 	$(RM) $@
-	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 2"
+	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL) Disk 2"
 	$(MAKDIR) $@,CMDS
 	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
 	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_D2),$@,CMDS/$(file))
@@ -579,7 +580,7 @@
 
 $(DSK720K):
 	$(RM) $@
-	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level 2"
+	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
 	$(OS9GEN) $@ -b=$(BOOTFILE_80D) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -633,7 +634,7 @@
 
 $(DSK720K_50HZ):
 	$(RM) $@
-	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level 2"
+	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
 	$(OS9GEN) $@ -b=$(BOOTFILE_80D_50HZ) -t=$(KERNELFILE_50HZ)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -686,5 +687,5 @@
 	$(SOFTLINK) $@ $(LDSK720K_50HZ)
 
 info:
-	@$(ECHO) "*** NitrOS-9/$(CPU) Level 2 for the Tandy Color Computer 3 ***"
+	@$(ECHO) "*** NitrOS-9/$(CPU) Level $(LEVEL) for the $(MACHINE) ***"
 	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)
--- a/level2/coco3/modules/makefile	Sun Jan 25 22:36:00 2015 +0100
+++ b/level2/coco3/modules/makefile	Sun Jan 25 22:36:01 2015 +0100
@@ -23,12 +23,12 @@
 TPB		= $(3RDPARTY)/booters
 
 BOOTERS		= boot_1773_6ms boot_1773_30ms \
-		 boot_burke boot_rampak boot_wd1002 boot_dw boot_dw_becker boot_dw_arduino \
+		boot_burke boot_rampak boot_wd1002 boot_dw boot_dw_becker boot_dw_arduino \
 		boot_tc3 boot_ide boot_sdc boot_rom
 BOOTTRACK	= rel_32 rel_40 rel_80 rel_32_50hz rel_40_50hz rel_80_50hz $(BOOTERS) krn
 KERNEL		= krnp2 krnp3_perr krnp4_regdump ccbkrn
 SYSMODS		= ioman init sysgo_h0 sysgo_dd sysgo_rom rominfo vectors
-CLOCKS          = clock_60hz clock_50hz \
+CLOCKS		= clock_60hz clock_50hz \
 		clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \
 		clock2_smart clock2_harris clock2_cloud9 clock2_soft \
 		clock2_jvemu clock2_messemu clock2_dw
@@ -66,11 +66,11 @@
 		v6.dw v7.dw \
 		scdwv.dr term_scdwv.dt n_scdwv.dd \
 		n1_scdwv.dd n2_scdwv.dd n3_scdwv.dd \
-                n4_scdwv.dd n5_scdwv.dd n6_scdwv.dd n7_scdwv.dd \
+		n4_scdwv.dd n5_scdwv.dd n6_scdwv.dd n7_scdwv.dd \
 		n8_scdwv.dd n9_scdwv.dd n10_scdwv.dd n11_scdwv.dd \
-                n12_scdwv.dd n13_scdwv.dd midi_scdwv.dd \
+		n12_scdwv.dd n13_scdwv.dd midi_scdwv.dd \
 		term_z_scdwv.dt z1_scdwv.dd z2_scdwv.dd z3_scdwv.dd \
-                z4_scdwv.dd z5_scdwv.dd z6_scdwv.dd z7_scdwv.dd \
+		z4_scdwv.dd z5_scdwv.dd z6_scdwv.dd z7_scdwv.dd \
 
 PIPE		= pipeman.mn pipeman_named.mn \
 		piper.dr \
@@ -78,7 +78,6 @@
 
 RFM		= rfm.mn rfmdrv.dr ddy0.dd y0.dd y1.dd y2.dd y3.dd
 
-#
 # The following macros represent a collection of modules for various
 # kernel tracks and bootfile configurations.
 #
@@ -97,6 +96,7 @@
 	$(OS9COPY) kernel/$@ .
 
 # Special cases
+
 # TC^3 SCSI Booter
 boot_tc3: boot_scsi.asm
 	$(AS) $(ASOUT)$@ $< $(TC3FLAGS)
@@ -138,10 +138,10 @@
 # Disto SC-II Drivers
 rb1773_scii_ff74.dr:    rb1773.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSCII=1
-                                                                            
+
 rb1773_scii_ff58.dr:    rb1773.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSCII=1 -DSCIIALT=1
-                                                                            
+
 # REL Modules
 rel_32: rel.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DWidth=32
@@ -171,13 +171,13 @@
 # SysGo Modules
 sysgo_dd: sysgo.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1
-	
+
 sysgo_h0: sysgo.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS)
-	
+
 sysgo_rom: sysgo.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DROM=1
-	
+
 # TC^3 SCSI Driver
 lltc3.dr: llscsi.asm
 	$(AS) $(ASOUT)$@ $< $(TC3FLAGS)
@@ -187,12 +187,12 @@
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS)
 
 # Floppy descriptors
-SSDD35		= -DCyls=35 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
-		-DInterlv=3 -DSAS=8 -DDensity=1
-DSDD40		= -DCyls=40 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
-		-DInterlv=3 -DSAS=8 -DDensity=1
-DSDD80		= -DCyls=80 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
-		-DInterlv=3 -DSAS=8 -DDensity=1 -DD35
+SSDD35	= -DCyls=35 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
+	-DInterlv=3 -DSAS=8 -DDensity=1
+DSDD40	= -DCyls=40 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+	-DInterlv=3 -DSAS=8 -DDensity=1
+DSDD80	= -DCyls=80 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+	-DInterlv=3 -DSAS=8 -DDensity=1 -DD35
 
 # HDB-DOS for SuperDriver
 HDBDOS                  = -DHB $(SSDD35) $(ID0) -DITDNS=8
--- a/level2/makefile	Sun Jan 25 22:36:00 2015 +0100
+++ b/level2/makefile	Sun Jan 25 22:36:01 2015 +0100
@@ -16,7 +16,7 @@
 
 # Clean all components
 clean:
-	$(foreach dir, $(dirs), ($(CD) $(dir); make clean);)
+	$(foreach dir,$(dirs),$(MAKE) -C $(dir) clean &&) :
 
 # Make DSK images
 dsk:
@@ -28,8 +28,8 @@
 
 # Clean DSK images
 dskclean:
-	$(foreach dir, $(dirs), ($(CD) $(dir); make dskclean);)
+	$(foreach dir,$(dirs),$(MAKE) -C $(dir) dskclean &&) :
 
 # Info
 info:
-	@$(foreach dir, $(dirs), $(MAKE) -C $(dir) info; $(ECHO);)
+	@$(foreach dir,$(dirs),$(MAKE) -C $(dir) info; $(ECHO);)
--- a/level3/coco3/makefile	Sun Jan 25 22:36:00 2015 +0100
+++ b/level3/coco3/makefile	Sun Jan 25 22:36:01 2015 +0100
@@ -58,11 +58,11 @@
 
 # Make all components
 all:
-	@$(ECHO) "**************************************************"
-	@$(ECHO) "*                                                *"
-	@$(ECHO) "*        NitrOS-9/$(CPU) Level $(LEVEL) Distribution      *"
-	@$(ECHO) "*                                                *"
-	@$(ECHO) "**************************************************"
+	@$(ECHO) "************************************************************"
+	@$(ECHO) "*"
+	@$(ECHO) "*      NitrOS-9/$(CPU) Level $(LEVEL) $(MACHINE) ($(PORT))"
+	@$(ECHO) "*"
+	@$(ECHO) "************************************************************"
 	$(foreach dir,$(DIRS),$(MAKE) -C $(dir) &&) :
 
 # Clean all components
--- a/level3/coco3/modules/makefile	Sun Jan 25 22:36:00 2015 +0100
+++ b/level3/coco3/modules/makefile	Sun Jan 25 22:36:01 2015 +0100
@@ -5,33 +5,34 @@
 
 AFLAGS		+= -I$(LEVEL1)/modules
 
-CLOCKELIM		= -DRTCElim=1
-CLOCKDISTO2		= -DRTCDsto2=1
-CLOCKDISTO4		= -DRTCDsto4=1
-CLOCKBNB		= -DRTCBB=1
-CLOCKSMART		= -DRTCSmart=1 -DMPIFlag=1
-CLOCKHARRIS		= -DRTCHarrs=1
-CLOCKCLOUD9		= -DRTCCloud9=1
-CLOCKSOFT		= -DRTCSoft=1
-CLOCKMESSEMU	= -DRTCMessEmu=1
-CLOCKJVEMU		= -DRTCJVEmu=1
-TC3FLAGS		= $(AFLAGS) -DTC3=1 $(FLAGS)
-IDEFLAGS		= $(AFLAGS) -DIDE=1 $(FLAGS)
-SDFLAGS			= $(AFLAGS) -DCOCOSDC=1 -DITTYP=128 $(FLAGS)
+CLOCKELIM       = -DRTCElim=1
+CLOCKDISTO2     = -DRTCDsto2=1
+CLOCKDISTO4     = -DRTCDsto4=1
+CLOCKBNB        = -DRTCBB=1
+CLOCKSMART      = -DRTCSmart=1 -DMPIFlag=1
+CLOCKHARRIS     = -DRTCHarrs=1
+CLOCKCLOUD9     = -DRTCCloud9=1
+CLOCKSOFT       = -DRTCSoft=1
+CLOCKMESSEMU    = -DRTCMessEmu=1
+CLOCKJVEMU      = -DRTCJVEmu=1
+TC3FLAGS        = $(AFLAGS) -DTC3=1 $(FLAGS)
+IDEFLAGS        = $(AFLAGS) -DIDE=1 $(FLAGS)
+SDFLAGS         = $(AFLAGS) -DCOCOSDC=1 -DITTYP=128 $(FLAGS)
 
-DEPENDS			= ./makefile
-TPB			= $(3RDPARTY)/booters
+DEPENDS		= ./makefile
+TPB		= $(3RDPARTY)/booters
 
 BOOTERS		= boot_1773_6ms boot_1773_30ms \
-		 boot_burke boot_rampak boot_wd1002 boot_dw boot_dw_becker boot_dw_arduino \
-		  boot_tc3 boot_ide boot_rom
+		boot_burke boot_rampak boot_wd1002 boot_dw boot_dw_becker boot_dw_arduino \
+		boot_tc3 boot_ide boot_rom
 BOOTTRACK	= rel_32 rel_40 rel_80 rel_32_50hz rel_40_50hz rel_80_50hz $(BOOTERS) krn
 KERNEL		= krnp2 krnp3_perr krnp4_regdump
-SYSMODS		= ioman init sysgo_h0 sysgo_dd sysgo_rom rominfo vectors nitro end
+SYSMODS		= ioman init sysgo_h0 sysgo_dd sysgo_rom rominfo vectors
+SYSMODS		+= nitro end
 CLOCKS		= clock_60hz clock_50hz \
-			clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \
-			clock2_smart clock2_harris clock2_cloud9 clock2_soft \
-			clock2_jvemu clock2_messemu clock2_dw
+		clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \
+		clock2_smart clock2_harris clock2_cloud9 clock2_soft \
+		clock2_jvemu clock2_messemu clock2_dw
 
 RBF		= rbf.mn \
 		rbdw.dr dwio.sb dwio_becker.sb dwio_arduino.sb \
@@ -72,11 +73,12 @@
 		term_z_scdwv.dt z1_scdwv.dd z2_scdwv.dd z3_scdwv.dd \
 		z4_scdwv.dd z5_scdwv.dd z6_scdwv.dd z7_scdwv.dd \
 
-PIPE	= pipeman.mn pipeman_named.mn \
+PIPE		= pipeman.mn pipeman_named.mn \
 		piper.dr \
 		pipe.dd
 
 RFM		= rfm.mn rfmdrv.dr ddy0.dd y0.dd y1.dd y2.dd y3.dd
+
 # The following macros represent a collection of modules for various
 # kernel tracks and bootfile configurations.
 #
@@ -85,6 +87,7 @@
 KERNEL_KENTON	= rel_32 $(TPB)/boot_kenton krn
 KERNEL_IDE	= rel_32 $(TPB)/boot_ide krn
 KERNEL_TC3	= rel_32 $(TPB)/boot_tc3 krn
+
 ALLOBJS		=  $(BOOTTRACK) $(KERNEL) $(SYSMODS) $(CLOCKS) $(RBF) $(SCF) $(PIPE) $(RFM)
 
 all:	$(ALLOBJS)
@@ -94,13 +97,15 @@
 	$(CD) kernel; make $@
 	$(OS9COPY) kernel/$@ .
 
+# Special cases
+
 # TC^3 SCSI Booter
 boot_tc3: boot_scsi.asm
 	$(AS) $(ASOUT)$@ $< $(TC3FLAGS)
 
 # SuperIDE/Glenside IDE Booter
 boot_ide: boot_ide.asm
-		$(AS) $(ASOUT)$@ $< $(IDEFLAGS)
+	$(AS) $(ASOUT)$@ $< $(IDEFLAGS)
 
 # DriveWire Becker Booter
 boot_dw_becker: boot_dw.asm
@@ -166,7 +171,7 @@
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1
 
 sysgo_h0: sysgo.asm
-		$(AS) $< $(ASOUT)$@ $(AFLAGS)
+	$(AS) $< $(ASOUT)$@ $(AFLAGS)
 
 sysgo_rom: sysgo.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DROM=1
@@ -180,11 +185,11 @@
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS)
 
 # Floppy descriptors
-SSDD35          = -DCyls=35 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
+SSDD35	= -DCyls=35 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
 	-DInterlv=3 -DSAS=8 -DDensity=1
-DSDD40		= -DCyls=40 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+DSDD40	= -DCyls=40 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
 	-DInterlv=3 -DSAS=8 -DDensity=1
-DSDD80          = -DCyls=80 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+DSDD80	= -DCyls=80 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
 	-DInterlv=3 -DSAS=8 -DDensity=1 -DD35
 
 # HDB-DOS for SuperDriver
@@ -384,7 +389,7 @@
 ih_ide.dd: superdesc.asm
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(HDBDOS)
 
-# SuperSD Descriptors
+# CoCo SDC Descriptors
 ddsd0_cocosdc.dd: superdesc.asm
 	$(AS) $(ASOUT)$@ $< $(SDFLAGS) -DDD=1