rearranged some makefile targets