Mercurial > hg > Members > kono > nitros9-code
changeset 2969:1adde0d916cd
sys/makefiles: Remove broken prerequisite from makefile rule
The $@ automatic variable is not allowed in a rule prerequisite.
It could be added using secondary expansion, but here there is
no point anyway, since the makefile is not meant to build this
prerequisite - it should exist in any case.
Also, since the coco3_6309/sys/makefile file is identical to the one
in coco3/sys, just keep the latter and include it from the other.
| author | Tormod Volden <debian.tormod@gmail.com> |
|---|---|
| date | Fri, 04 Apr 2014 22:02:04 +0200 |
| parents | 13885d9433d5 |
| children | b77c7bb3d757 |
| files | level2/coco3/sys/makefile level2/sys/makefile level3/coco3/sys/makefile level3/coco3_6309/sys/makefile |
| diffstat | 4 files changed, 5 insertions(+), 65 deletions(-) [+] |
line wrap: on
line diff
--- a/level2/coco3/sys/makefile Fri Apr 04 21:34:02 2014 +0200 +++ b/level2/coco3/sys/makefile Fri Apr 04 22:02:04 2014 +0200 @@ -6,7 +6,7 @@ DEPENDS = ./makefile L1TXTFILES = errmsg password -L2TXTFILES = $(NITROS9DIR)/level2/sys/motd +L2TXTFILES = $(LEVEL2)/sys/motd BINFILES = stdfonts stdpats_2 stdpats_4 stdpats_16 stdptrs \ ibmedcfont isolatin1font HELPFILES = asm.hp attr.hp \ @@ -44,7 +44,7 @@ $(HELPMSG): $(HELPFILES) $(MERGE) $^ > $@ -$(L1TXTFILES): $(LEVEL1)/sys/$@ +$(L1TXTFILES): $(SOFTLINK) -f $(LEVEL1)/sys/$@ inetd.conf: $(LEVEL1)/sys/inetd.conf
--- a/level2/sys/makefile Fri Apr 04 21:34:02 2014 +0200 +++ b/level2/sys/makefile Fri Apr 04 22:02:04 2014 +0200 @@ -44,7 +44,7 @@ $(HELPMSG): $(HELPFILES) $(MERGE) $^ > $@ -$(L1TXTFILES): $(LEVEL1)/sys/$@ +$(L1TXTFILES): $(SOFTLINK) -f $(LEVEL1)/sys/$@ clean:
--- a/level3/coco3/sys/makefile Fri Apr 04 21:34:02 2014 +0200 +++ b/level3/coco3/sys/makefile Fri Apr 04 22:02:04 2014 +0200 @@ -45,7 +45,7 @@ $(HELPMSG): $(HELPFILES) $(MERGE) $^ > $@ -$(L1TXTFILES): $(LEVEL1)/sys/$@ +$(L1TXTFILES): $(SOFTLINK) -f $(LEVEL1)/sys/$@ clean:
--- a/level3/coco3_6309/sys/makefile Fri Apr 04 21:34:02 2014 +0200 +++ b/level3/coco3_6309/sys/makefile Fri Apr 04 22:02:04 2014 +0200 @@ -1,61 +1,1 @@ -PORT = coco3 -include $(NITROS9DIR)/rules.mak - -vpath %.hp $(LEVEL2)/sys:$(LEVEL1)/sys -vpath %.asm $(LEVEL2)/sys - -DEPENDS = ./makefile - -L1TXTFILES = errmsg password -L2TXTFILES = motd -BINFILES = stdfonts stdpats_2 stdpats_4 stdpats_16 stdptrs \ - ibmedcfont isolatin1font -HELPFILES = asm.hp attr.hp \ - backup.hp basic09.hp binex.hp build.hp \ - chd.hp chx.hp cmp.hp cobbler.hp config.hp copy.hp cputype.hp \ - date.hp dcheck.hp debug.hp ded.hp deiniz.hp del.hp deldir.hp devs.hp \ - dir.hp dirsort.hp disasm.hp display.hp dmem.hp dmode.hp dsave.hp dump.hp \ - echo.hp edit.hp error.hp ex.hp exbin.hp \ - format.hp free.hp \ - gfx.hp gfx2.hp grfdrv.hp \ - help.hp \ - ident.hp iniz.hp inkey.hp irqs.hp \ - kill.hp \ - link.hp list.hp load.hp login.hp \ - makdir.hp mdir.hp megaread.hp merge.hp mfree.hp mmap.hp modpatch.hp \ - montype.hp mpi.hp os9gen.hp \ - padrom.hp park.hp pmap.hp proc.hp procs.hp prompt.hp pwd.hp pxd.hp \ - reboot.hp rename.hp runb.hp \ - save.hp setime.hp setpr.hp shell.hp sleep.hp smap.hp \ - tee.hp tmode.hp touch.hp tsmon.hp tuneport.hp \ - unlink.hp \ - verify.hp \ - wcreate.hp \ - xmode.hp - -#HELPFILES = make.hp maketerm.hp rdump.hp rlink.hp rma.hp scred.hp - -HELPMSG = helpmsg - -TEXTFILES = $(L2TXTFILES) $(HELPMSG) $(L1TXTFILES) -ALLOBJS = $(TEXTFILES) $(BINFILES) - -all: $(ALLOBJS) $(DEPENDS) - -$(HELPMSG): $(HELPFILES) - $(MERGE) $^ > $@ - -$(L1TXTFILES): $(LEVEL1)/sys/$@ - $(SOFTLINK) -f $(LEVEL1)/sys/$@ - -clean: - $(RM) $(HELPMSG) $(L1TXTFILES) $(BINFILES) - -showbinobjs: - @$(ECHO) $(BINFILES) - -showtextobjs: - @$(ECHO) $(TEXTFILES) - -showobjs: - @$(ECHO) $(ALLOBJS) +include ../../coco3/sys/makefile