some make file fixes

Change-Id: Ibc2bbb9446666385e5c25d0eed9e215bdfef8ea7