Improved makefile.
Merge branch 'amr-dev' of https://github.com/PROJECT-CDMATH/CDMATH into amr-dev

Conflicts:
	examples/amr/main.cxx
Resolved merge conflicts.