Makefile cleanup. Changed #ifdef wrappers in libFoo.h instances to be the same, for demo puposes.