Mercurial > hg > Members > kono > nitros9-code
view 3rdparty/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 | 1c1600cc9f02 |
line wrap: on
line source
include ../rules.mak dirs = booters drivers fmgrs p2mods subrtns utils packages # Make all components all: @$(ECHO) "**************************************************" @$(ECHO) "* *" @$(ECHO) "* 3rd Party Software *" @$(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);) # Clean DSK images dskclean: $(foreach dir, $(dirs), ($(CD) $(dir); make dskclean);) # Copy DSK images dskcopy: $(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);) # Info info: @$(foreach dir, $(dirs), $(MAKE) -C $(dir) info;)