Mercurial > hg > Members > kono > nitros9-code
view level2/coco3_6309/modules/kernel/makefile @ 2898:28ed72477814 lwtools-port
Dummy merge of default branch into lwtools
hg -y merge --tool=internal:fail default
hg revert --all --no-backup --rev .
hg resolve -a -m
This dummy merge discards any changes from the default branch
so that the result is the same as what lwtools already had.
When merging back to default branch later, the discarded
changes will be discarded there also, so the result
will be that the default branch will contain what
the lwtools branch had before these merges.
Only scripts/burst was "rescued" from default branch.
author | Tormod Volden <debian.tormod@gmail.com> |
---|---|
date | Sat, 11 Jan 2014 18:40:44 +0100 |
parents | ed9a4cb85fb3 1addfd8c9d5f |
children | 94470c7cc95e |
line wrap: on
line source
PORT = coco3 include $(NITROS9DIR)/rules.mak vpath %.asm $(LEVEL2)/modules/kernel:$(LEVEL1)/modules/kernel DEPENDS = ./makefile AFLAGS += -DH6309=1 -I$(LEVEL2)/modules/kernel -I$(LEVEL1)/modules/kernel KERNEL = krn KERNELP2 = krnp2 SYSCALLS = fallimg.asm fallram.asm falltsk.asm faproc.asm fcmpnam.asm \ fcpymem.asm fdatlog.asm fdelram.asm ffmodul.asm ffreehb.asm \ fld.asm fldabx.asm flink.asm fmove.asm fnproc.asm fprsnam.asm \ fdebug.asm fsrqmem.asm fssvc.asm fvmodul.asm \ fallbit.asm fallprc.asm fchain.asm fclrblk.asm fcrcmod.asm \ fdelimg.asm fexit.asm ffind64.asm ffork.asm fgblkmp.asm \ fgcmdir.asm fgmoddr.asm fgprdsc.asm fgprocp.asm ficpt.asm \ fid.asm fmapblk.asm fmem.asm fsend.asm fsleep.asm fsprior.asm \ fsswi.asm fstime.asm fsuser.asm funlink.asm funload.asm ALLOBJS = $(KERNEL) $(KERNELP2) all: $(ALLOBJS) $(KERNEL): krn.asm $(SYSCALLS) $(KERNELP2): krnp2.asm $(SYSCALLS) clean: $(RM) $(ALLOBJS) showobjs: @$(ECHO) $(ALLOBJS) showcopyobjs: @$(ECHO) $(COPYOBJS) identify: $(IDENT_SHORT) $(ALLOBJS)