Tweak makefile and makefile_tgt.mk