use new obuild
remove redundant code from makefile