fix as make files after reorganization buid macros