Apache Makefile improvements.
Apache Makefile improvements.

ashish-gehani/OCCAM,SRI-CSL/OCCAM,ashish-gehani/OCCAM,SRI-CSL/OCCAM,ashish-gehani/OCCAM,SRI-CSL/OCCAM,SRI-CSL/OCCAM,SRI-CSL/OCCAM,ashish-gehani/OCCAM