Mercurial > hg > Members > kono > nitros9-code
view bootman/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 | c1892376e7a7 1addfd8c9d5f |
children | ee6df245e208 |
line wrap: on
line source
include ../rules.mak all: bootman_coco_6551 bootman_coco3_6551 #bootman_loader bootman_loader: bootman_loader.a mamou $^ -o$@ -mb bootman_coco_6551: bootman.r boot_config.r mach_coco.r llio_6551.r llbt_1773.r $(LINKER) $^ -o=$@ bootman_coco3_6551: bootman.r boot_config.r mach_coco3.r llio_6551.r llbt_1773.r $(LINKER) $^ -o=$@ dsk: bootman decb dskini bootman.dsk decb copy -b -2 bootman_coco_6551 bootman.dsk,BM6551.BIN decb copy -b -2 bootman_coco3_6551 bootman.dsk,BM36551.BIN clean: $(RM) *.r bootman_coco_6551 bootman_coco3_6551 bootman.dsk