Revised build definition.

Removed separate sub module for macros. We don't need this, since the
macros are part of the library (which is compiled before the user code
anyway).