Mercurial > hg > Members > kono > nitros9-code
view level1/cmds/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 | 87130746d4d9 1addfd8c9d5f |
children |
line wrap: on
line source
PORT = include ../../rules.mak vpath %.asm $(3RDPARTY)/packages/basic09 DEPENDS = ./makefile BASIC09FILES = runb.asm gfx.asm inkey.asm syscall.asm CMDS = asm attr backup binex build cmp cobbler copy cputype \ date dcheck debug ded deiniz del deldir devs dir dirsort disasm \ display dmode dsave dump echo edit error exbin format \ free grfdrv help ident iniz irqs link list load login makdir \ megaread mdir merge mfree minted mpi os9gen padrom park printerr procs prompt pwd pxd \ rename runb save setime shellplus shell_21 sleep \ tee tmode touch tsmon tuneport unlink verify xmode DRAGONCMDS = asm attr backup binex build cmp cobbler_dragon copy cputype \ date dcheck debug ded deiniz del deldir devs dir dirsort disasm \ display dmode dsave dump echo edit error exbin format \ free grfdrv help ident iniz irqs link list load login makdir \ megaread mdir merge mfree mpi os9gen padrom park printerr procs prompt pwd pxd \ rename runb save setime shellplus shell_21 sleep \ tee tmode touch tsmon tuneport unlink verify xmode DRAGON525CMDS = asm attr backup binex build cmp cobbler copy date del deldir \ dir display dmode dsave dump echo exbin format free ident link list \ load login makdir mdir merge mfree os9gen printerr procs pwd pxd rename \ save setime shell_21 sleep tee tmode tsmon unlink verify xmode acia51 dmode DRAGON525CMDS2 = cputype dcheck debug ded deiniz devs dirsort disasm edit error \ grfdrv help iniz irqs megaread mpi os9gen padrom park printerr prompt \ runb shellplus shell_21 touch tuneport SUBS = gfx inkey syscall ALLOBJS = $(CMDS) $(DRAGONCMDS) $(SUBS) all: $(ALLOBJS) alldragon: $(DRAGONCMDS) $(SUBS) pwd: pd.asm $(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1 xmode: xmode.asm $(AS) $(AFLAGS) $< $(ASOUT)$@ -aXMODE=1 tmode: xmode.asm $(AS) $(AFLAGS) $< $(ASOUT)$@ -aTMODE=1 pxd: pd.asm $(AS) $(AFLAGS) $< $(ASOUT)$@ -aPXD=1 cobbler_dragon: cobbler.asm $(AS) $(AFLAGS) $< $(ASOUT)cobbler_dragon -aDRAGON=1 clean: $(RM) $(ALLOBJS) identify: $(IDENT_SHORT) $(ALLOBJS) showallobjs: @$(ECHO) $(ALLOBJS) showcocoobjs: @$(ECHO) $(CMDS) $(SUBS) showdragonobjs: @$(ECHO) $(sort $(CMDS) $(DRAGONCMDS)) showdragon525objs: @$(ECHO) $(DRAGON525CMDS) $(SUBS) showdragon525objs2: @$(ECHO) $(DRAGON525CMDS2) $(SUBS)