Makefile no longer tries to resolve CFLAG changes.
To make this work we'd have to .FORCE any file that uses preprocessor options manually and this it not workable. Solution is to 'make clean' before making with options.
Added barriers.
Merge branch 'feature/sync' into develop