Mercurial > hg > Members > kono > nitros9-code
changeset 3133:815cc5a9d9d3
mc09: Bring makefiles in line with level1/level2 coco makefiles
In particular do not build zip packages.
Delete trailing whitespace in level1/coco1/makefile.
| author | Neal Crook <foofoobedoo@gmail.com> |
|---|---|
| date | Fri, 13 Jan 2017 20:36:04 +0000 |
| parents | 9bb0c42d9fc6 |
| children | afd35e662b2b |
| files | level1/coco1/makefile level1/mc09/makefile level2/mc09l2/makefile |
| diffstat | 3 files changed, 10 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/level1/coco1/makefile Fri Jan 13 19:52:26 2017 +0000 +++ b/level1/coco1/makefile Fri Jan 13 20:36:04 2017 +0000 @@ -586,6 +586,6 @@ $(SOFTLINK) $@ $(LDSK720K) info: - @$(ECHO) "*** NitrOS-9/$(CPU) Level $(LEVEL) for the $(MACHINE) ***" + @$(ECHO) "*** NitrOS-9/$(CPU) Level $(LEVEL) for the $(MACHINE) ***" @$(foreach dsk, $(DSKS), $(ECHO) $(dsk);) - +
--- a/level1/mc09/makefile Fri Jan 13 19:52:26 2017 +0000 +++ b/level1/mc09/makefile Fri Jan 13 20:36:04 2017 +0000 @@ -31,7 +31,6 @@ STARTUP = startup STARTUP_DW = startup.dw -PACKAGENAME = $(DISTROVER).zip DSK720K = $(DISTROVER)_80d.dsk LDSK720K = $(DISTRONAME)$(PORT)_80d.dsk @@ -49,22 +48,16 @@ # Clean all components clean: dskclean - $(foreach dir, $(DIRS), ($(CD) $(dir); make clean);) + $(foreach dir,$(DIRS),$(MAKE) -C $(dir) clean &&) : dskclean: - $(RM) $(PACKAGENAME) $(DSKS) $(LDSKS) + $(RM) $(DSKS) $(LDSKS) -dsk: all $(PACKAGENAME) +dsk: all $(DSKS) -dskcopy: dsk +dskcopy: $(DSKS) $(CP) $(DSKS) $(DSKDIR) -scp: dsk - scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html - -$(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog - $(ARCHIVE) $@ $^ - $(DSK720K): $(RM) $@ $(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
--- a/level2/mc09l2/makefile Fri Jan 13 19:52:26 2017 +0000 +++ b/level2/mc09l2/makefile Fri Jan 13 20:36:04 2017 +0000 @@ -1,9 +1,4 @@ -ifeq ($(CPU),) - CPU = 6809 -endif - include port.mak -include $(NITROS9DIR)/rules.mak DISTRO = $(CPU)L$(LEVEL) DISTRONAME = nos9$(CPU)l$(LEVEL) @@ -33,7 +28,6 @@ SYSGO = sysgo_dd CCBKRN = ccbkrn -PACKAGENAME = $(DISTROVER).zip DSK720K = $(DISTROVER)_80d.dsk LDSK720K = $(DISTRONAME)_80d.dsk TESTDSK = test.dsk @@ -53,22 +47,16 @@ # Clean all components clean: dskclean - $(foreach dir, $(DIRS), ($(CD) $(dir); make clean);) + $(foreach dir,$(DIRS),$(MAKE) -C $(dir) clean &&) : dskclean: - $(RM) $(PACKAGENAME) $(DSKS) $(LDSKS) + $(RM) $(DSKS) $(LDSKS) -dsk: all $(PACKAGENAME) +dsk: all $(DSKS) -dskcopy: dsk +dskcopy: $(DSKS) $(CP) $(DSKS) $(DSKDIR) -scp: dsk - scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html - -$(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog - $(ARCHIVE) $@ $^ - $(DSK720K): $(RM) $@ $(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"