Java: package support, makefile update