Fixed Makefile problems with the samples and added several missing makefiles.
fix Makefile under water directory
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.