more Makefile modification to merge with hwstar files