makefile changes
more Makefile changes
yet more Makefile changes