# HG changeset patch # User Gene Heskett # Date 1414323681 -3600 # Node ID 8e1891c6cc4aa94292519aa6d11a517002b4f2dc # Parent 9cae8c7cf7fd040a5285722c2d8e22ca58797dcb level3 makefiles: Lots of whitespace fixes, no code changes diff -r 9cae8c7cf7fd -r 8e1891c6cc4a level3/coco3/cmds/makefile --- a/level3/coco3/cmds/makefile Sun Oct 26 08:44:53 2014 +0100 +++ b/level3/coco3/cmds/makefile Sun Oct 26 12:41:21 2014 +0100 @@ -14,8 +14,8 @@ pmap proc procs prompt pwd pxd reboot rename save setime \ shell_21 sleep smap sfree tee tmode touch tsmon tuneport unlink verify wcreate xmode -CMDS_D2 = basic09 runb gfx2 gfx inkey syscall copy del echo format \ - merge os9gen prompt tmode +CMDS_D2 = basic09 runb gfx2 gfx inkey syscall copy del echo format \ + merge os9gen prompt tmode SHELLMODS = shellplus date deiniz echo iniz link load save unlink UTILPAK1 = attr build copy del deldir dir display list makdir mdir \ @@ -42,17 +42,17 @@ pxd: pd.asm $(AS) $(AFLAGS) $< $(ASOUT)$@ -DPXD=1 -shell: $(SHELLMODS) $(DEPENDS) - $(MERGE) $(SHELLMODS)>$@ - @$(ECHO) "*** Be sure the size of this file is less than 7681 bytes! ***" - @ls -l $@ - @$(ECHO) "" +shell: $(SHELLMODS) $(DEPENDS) + $(MERGE) $(SHELLMODS)>$@ + @$(ECHO) "*** Be sure the size of this file is less than 7681 bytes! ***" + @ls -l $@ + @$(ECHO) "" -utilpak1: $(UTILPAK1) $(DEPENDS) - $(MERGE) $(UTILPAK1)>$@ - @$(ECHO) "*** Be sure the size of this file is less than 7681 bytes! ***" - @ls -l $@ - @$(ECHO) "" +utilpak1: $(UTILPAK1) $(DEPENDS) + $(MERGE) $(UTILPAK1)>$@ + @$(ECHO) "*** Be sure the size of this file is less than 7681 bytes! ***" + @ls -l $@ + @$(ECHO) "" clean: $(RM) shell utilpak1 $(SUBS) $(SHELLMODS) $(CMDS) $(CMDS_D2) diff -r 9cae8c7cf7fd -r 8e1891c6cc4a level3/coco3/makefile --- a/level3/coco3/makefile Sun Oct 26 08:44:53 2014 +0100 +++ b/level3/coco3/makefile Sun Oct 26 12:41:21 2014 +0100 @@ -3,7 +3,7 @@ include $(NITROS9DIR)/rules.mak CPU = 6809 -LEVEL = 3 +LEVEL = 3 DISTRO = $(CPU)L$(LEVEL) DISTRONAME = nos9$(CPU)l$(LEVEL) diff -r 9cae8c7cf7fd -r 8e1891c6cc4a level3/coco3/modules/makefile --- a/level3/coco3/modules/makefile Sun Oct 26 08:44:53 2014 +0100 +++ b/level3/coco3/modules/makefile Sun Oct 26 12:41:21 2014 +0100 @@ -5,34 +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 +TPB = $(3RDPARTY)/booters BOOTERS = boot_1773_6ms boot_1773_30ms \ boot_tc3 boot_ide \ - boot_dw_becker boot_dw_arduino boot_rom \ + boot_dw_becker boot_dw_arduino boot_rom \ boot_burke boot_rampak boot_wd1002 boot_dw 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 -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 +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 RBF = rbf.mn \ rbdw.dr dwio.sb dwio_becker.sb dwio_arduino.sb \ @@ -73,7 +73,7 @@ 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 @@ -132,7 +132,7 @@ # 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 @@ -165,13 +165,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) @@ -181,12 +181,12 @@ $(AS) $(ASOUT)$@ $< $(IDEFLAGS) # Floppy descriptors -SSDD35 = -DCyls=35 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \ - -DInterlv=3 -DSAS=8 -DDensity=1 +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 + -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 @@ -253,7 +253,7 @@ $(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=192 ddr0_192k.dd: r0.asm - $(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=192 -DDD=1 + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=192 -DDD=1 # DriveWire SCF descriptors term_scdwv.dt: scdwvdesc.asm diff -r 9cae8c7cf7fd -r 8e1891c6cc4a level3/coco3_6309/cmds/makefile --- a/level3/coco3_6309/cmds/makefile Sun Oct 26 08:44:53 2014 +0100 +++ b/level3/coco3_6309/cmds/makefile Sun Oct 26 12:41:21 2014 +0100 @@ -6,7 +6,7 @@ DEPENDS = ./makefile AFLAGS += -DH6309=1 -I=$(NITROS9DIR)/3rdparty/packages/basic09 -CMDS = asm attr backup binex build cmp cobbler copy cputype \ +CMDS = asm attr backup binex build cmp cobbler copy cputype \ date dcheck debug ded deiniz del deldir devs dir dirsort disasm \ display dmem dmode dsave dump echo edit error exbin \ format free grfdrv help ident iniz irqs link list load login \ @@ -14,8 +14,8 @@ pmap proc procs prompt pwd pxd reboot rename save setime \ shell_21 sleep smap sfree tee tmode touch tsmon tuneport unlink verify wcreate xmode -CMDS_D2 = basic09 runb gfx2 gfx inkey syscall copy del echo format \ - merge os9gen prompt tmode +CMDS_D2 = basic09 runb gfx2 gfx inkey syscall copy del echo format \ + merge os9gen prompt tmode SHELLMODS = shellplus date deiniz echo iniz link load save unlink UTILPAK1 = attr build copy del deldir dir display list makdir mdir \ @@ -42,17 +42,17 @@ pxd: pd.asm $(AS) $(AFLAGS) $< $(ASOUT)$@ -DPXD=1 -shell: $(SHELLMODS) $(DEPENDS) +shell: $(SHELLMODS) $(DEPENDS) $(MERGE) $(SHELLMODS)>$@ @$(ECHO) "*** Be sure the size of this file is less than 7681 bytes! ***" @ls -l $@ @$(ECHO) "" -utilpak1: $(UTILPAK1) $(DEPENDS) - $(MERGE) $(UTILPAK1)>$@ - @$(ECHO) "*** Be sure the size of this file is less than 7681 bytes! ***" - @ls -l $@ - @$(ECHO) "" +utilpak1: $(UTILPAK1) $(DEPENDS) + $(MERGE) $(UTILPAK1)>$@ + @$(ECHO) "*** Be sure the size of this file is less than 7681 bytes! ***" + @ls -l $@ + @$(ECHO) "" clean: $(RM) shell utilpak1 $(SUBS) $(SHELLMODS) $(CMDS) $(CMDS_D2) diff -r 9cae8c7cf7fd -r 8e1891c6cc4a level3/coco3_6309/modules/makefile --- a/level3/coco3_6309/modules/makefile Sun Oct 26 08:44:53 2014 +0100 +++ b/level3/coco3_6309/modules/makefile Sun Oct 26 12:41:21 2014 +0100 @@ -28,10 +28,10 @@ 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 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 +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 RBF = rbf.mn \ rbdw.dr dwio.sb \ @@ -60,17 +60,17 @@ v1.dw v2.dw v3.dw v4.dw v5.dw \ v6.dw v7.dw \ scdwv.dr term_scdwv.dt n0_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 \ 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# +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. # @@ -118,10 +118,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_32: rel.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -DWidth=32 diff -r 9cae8c7cf7fd -r 8e1891c6cc4a level3/makefile --- a/level3/makefile Sun Oct 26 08:44:53 2014 +0100 +++ b/level3/makefile Sun Oct 26 12:41:21 2014 +0100 @@ -12,7 +12,7 @@ @$(ECHO) "* NitrOS-9 Level $(LEVEL) Ports *" @$(ECHO) "* *" @$(ECHO) "**************************************************" - $(foreach dir,$(dirs),$(MAKE) -C $(dir) &&) : + $(foreach dir, $(dirs), $(MAKE) -C $(dir) &&) : # Clean all components clean: @@ -20,11 +20,11 @@ # Make DSK images dsk: - $(foreach dir,$(dirs),$(MAKE) -C $(dir) dsk &&) : + $(foreach dir, $(dirs), $(MAKE) -C $(dir) dsk &&) : # Copy DSK images dskcopy: - $(foreach dir,$(dirs),$(MAKE) -C $(dir) dskcopy &&) : + $(foreach dir, $(dirs), $(MAKE) -C $(dir) dskcopy &&) : # Clean DSK images dskclean: