Mercurial > hg > Members > kono > nitros9-code
changeset 2965:9edca3e61b66
3rdparty: Stop build on failing dsk or dskcopy targets
Add dummy dsk and dskcopy targets where there are no
disk images to be built.
| author | Tormod Volden <debian.tormod@gmail.com> |
|---|---|
| date | Mon, 10 Feb 2014 01:36:20 +0100 |
| parents | 6f7dec3a68f0 |
| children | e84a638d1c16 |
| files | 3rdparty/booters/makefile 3rdparty/drivers/makefile 3rdparty/fmgrs/makefile 3rdparty/fmgrs/msf/makefile 3rdparty/makefile 3rdparty/p2mods/makefile 3rdparty/packages/makefile 3rdparty/packages/raakatu/makefile 3rdparty/subrtns/makefile 3rdparty/utils/makefile |
| diffstat | 10 files changed, 25 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/3rdparty/booters/makefile Mon Feb 10 01:11:02 2014 +0100 +++ b/3rdparty/booters/makefile Mon Feb 10 01:36:20 2014 +0100 @@ -10,6 +10,8 @@ clean: $(RM) $(ALLOBJS) +dsk: +dskcopy: # OS-9 Level Two Booters boot_ktlr_id0: boot_scsi.asm
--- a/3rdparty/drivers/makefile Mon Feb 10 01:11:02 2014 +0100 +++ b/3rdparty/drivers/makefile Mon Feb 10 01:36:20 2014 +0100 @@ -14,3 +14,7 @@ # Clean all components clean: $(foreach dir, $(dirs), ($(CD) $(dir); make clean);) + +dsk: +dskcopy: +
--- a/3rdparty/fmgrs/makefile Mon Feb 10 01:11:02 2014 +0100 +++ b/3rdparty/fmgrs/makefile Mon Feb 10 01:36:20 2014 +0100 @@ -9,16 +9,16 @@ @$(ECHO) "* File Managers *" @$(ECHO) "* *" @$(ECHO) "**************************************************" - $(foreach dir, $(dirs), $(CD) $(dir); make; $(CD) ..;) + $(foreach dir,$(dirs),$(MAKE) -C $(dir) &&) : # Clean all components clean: - $(foreach dir, $(dirs), $(CD) $(dir); make clean; $(CD) ..;) + $(foreach dir, $(dirs), $(MAKE) -C $(dir) clean ;) # Make DSK images dsk: - $(foreach dir, $(dirs), $(CD) $(dir); make dsk; $(CD) ..;) + $(foreach dir,$(dirs),$(MAKE) -C $(dir) dsk &&) : # Copy DSK images dskcopy: - $(foreach dir, $(dirs), $(CD) $(dir); make dskcopy; $(CD) ..;) + $(foreach dir,$(dirs),$(MAKE) -C $(dir) dskcopy &&) :
--- a/3rdparty/fmgrs/msf/makefile Mon Feb 10 01:11:02 2014 +0100 +++ b/3rdparty/fmgrs/msf/makefile Mon Feb 10 01:36:20 2014 +0100 @@ -20,3 +20,5 @@ msf_6809.mn: msf.asm $(AS) $(AFLAGS) $< $(ASOUT)$@ +dsk: +dskcopy:
--- a/3rdparty/makefile Mon Feb 10 01:11:02 2014 +0100 +++ b/3rdparty/makefile Mon Feb 10 01:36:20 2014 +0100 @@ -17,7 +17,7 @@ # Make DSK images dsk: - $(foreach dir, $(dirs), ($(CD) $(dir); make dsk);) + $(foreach dir,$(dirs),$(MAKE) -C $(dir) dsk &&) : # Clean DSK images dskclean: @@ -25,7 +25,7 @@ # Copy DSK images dskcopy: - $(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);) + $(foreach dir,$(dirs),$(MAKE) -C $(dir) dskcopy &&) : # Info info:
--- a/3rdparty/p2mods/makefile Mon Feb 10 01:11:02 2014 +0100 +++ b/3rdparty/p2mods/makefile Mon Feb 10 01:36:20 2014 +0100 @@ -15,3 +15,6 @@ clean: $(RM) $(ALLOBJS) + +dsk: +dskcopy:
--- a/3rdparty/packages/makefile Mon Feb 10 01:11:02 2014 +0100 +++ b/3rdparty/packages/makefile Mon Feb 10 01:36:20 2014 +0100 @@ -17,11 +17,11 @@ # Create dsk images dsk: - $(foreach dir, $(dirs), ($(CD) $(dir); make dsk);) + $(foreach dir,$(dirs),$(MAKE) -C $(dir) dsk &&) : # Copy dsk images dskcopy: - $(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);) + $(foreach dir,$(dirs),$(MAKE) -C $(dir) dskcopy &&) : # Clean dsk images dskclean:
--- a/3rdparty/packages/raakatu/makefile Mon Feb 10 01:11:02 2014 +0100 +++ b/3rdparty/packages/raakatu/makefile Mon Feb 10 01:36:20 2014 +0100 @@ -41,6 +41,8 @@ $(OS9ATTR_EXEC) $(DISK),CMDS/shell # $(OS9ATTR_TEXT) $(foreach file,$(SUPPORTFILES),$(DISK),SUB/$(file)) +dsk: $(DISK) + dskcopy: $(DISK) $(OS9COPY) $(DISK) $(DSKDIR)
--- a/3rdparty/subrtns/makefile Mon Feb 10 01:11:02 2014 +0100 +++ b/3rdparty/subrtns/makefile Mon Feb 10 01:36:20 2014 +0100 @@ -24,3 +24,5 @@ clean: $(RM) $(ALLOBJS) +dsk: +dskcopy:
--- a/3rdparty/utils/makefile Mon Feb 10 01:11:02 2014 +0100 +++ b/3rdparty/utils/makefile Mon Feb 10 01:36:20 2014 +0100 @@ -17,14 +17,14 @@ # Make DSK images dsk: - $(foreach dir, $(dirs), ($(CD) $(dir); make dsk);) + $(foreach dir,$(dirs),$(MAKE) -C $(dir) dsk &&) : dskclean: $(foreach dir, $(dirs), ($(CD) $(dir); make dskclean);) # Copy DSK images dskcopy: - $(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);) + $(foreach dir,$(dirs),$(MAKE) -C $(dir) dskcopy &&) : # info info: