Mercurial > hg > Members > kono > nitros9-code
annotate level1/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 |
rev | line source |
---|---|
2047 | 1 include $(NITROS9DIR)/rules.mak |
2 | |
2822
4ffb283f6233
Forgot to add to makefile
Boisy Pitre <boisy.pitre@nuance.com>
parents:
2701
diff
changeset
|
3 dirs = coco1 deluxe coco2 coco2b tano d64 dalpha atari |
2047 | 4 |
5 # Make all components | |
6 all: | |
7 @$(ECHO) "**************************************************" | |
8 @$(ECHO) "* *" | |
9 @$(ECHO) "* NitrOS-9 Level 1 Ports *" | |
10 @$(ECHO) "* *" | |
11 @$(ECHO) "**************************************************" | |
12 $(foreach dir, $(dirs), ($(CD) $(dir); make);) | |
13 | |
14 # Clean all components | |
2224 | 15 clean: |
2047 | 16 $(foreach dir, $(dirs), ($(CD) $(dir); make clean);) |
17 | |
18 # Make DSK images | |
19 dsk: | |
20 $(foreach dir, $(dirs), ($(CD) $(dir); make dsk);) | |
21 | |
2199 | 22 # Copy DSK images |
23 dskcopy: | |
24 $(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);) | |
25 | |
2047 | 26 # Clean DSK images |
27 dskclean: | |
28 $(foreach dir, $(dirs), ($(CD) $(dir); make dskclean);) | |
2216 | 29 |
30 # Info | |
31 info: | |
2861
bd286ab169c7
Makefiles: Make make info prettier for dsks/ReadMe
Tormod Volden <debian.tormod@gmail.com>
parents:
2822
diff
changeset
|
32 @$(foreach dir, $(dirs), $(MAKE) -C $(dir) info; $(ECHO);) |
2216 | 33 |