Added a makefile mechanism