* reorganized makefile targets