Revert "adjusted sample makefile for OSX"

This reverts commit 018cfb7951a917e5307eb5b16ecf260da8c86428.

Conflicts:

	sample/makefile
fixed buildall so that it can be run from anywhere