Small Makefile modifications [in PJproject compilation]
Tidying up before upstream merge