Mercurial > hg > Members > kono > nitros9-code
view level2/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 | bd286ab169c7 1addfd8c9d5f |
children | 14b4f2791bb3 |
line wrap: on
line source
include $(NITROS9DIR)/rules.mak dirs = coco3 coco3_6309 # Make all components all: @$(ECHO) "**************************************************" @$(ECHO) "* *" @$(ECHO) "* NitrOS-9 Level 2 Ports *" @$(ECHO) "* *" @$(ECHO) "**************************************************" $(foreach dir, $(dirs), ($(CD) $(dir); make);) # Clean all components clean: $(foreach dir, $(dirs), ($(CD) $(dir); make clean);) # Make DSK images dsk: $(foreach dir, $(dirs), ($(CD) $(dir); make dsk);) # Copy DSK images dskcopy: $(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);) # Clean DSK images dskclean: $(foreach dir, $(dirs), ($(CD) $(dir); make dskclean);) # Info info: @$(foreach dir, $(dirs), $(MAKE) -C $(dir) info; $(ECHO);)