Made Makefiles conformant with new rules

Makefile

 # A Makefile for MELODIC
 
-include ${FSLDIR}/etc/default.mk
+include ${FSLCONFDIR}/default.mk
 
 OPTFLAGS = -O3
 
 PROJNAME = melodic2
 
-USRINCFLAGS = -I${INCDIR}/utils -I${INCDIR}/newimage -I${INCDIR}/newmat -I${INCDIR}/avwio -I${INCDIR}/miscmaths -I${INCDIR}/libprob -I${INCDIR}/libvis -I${INCDIR}/libgdc -I${INCDIR}/libgd -I${INCDIR}/libpng -I${INCDIR}/zlib
-
-
 LIBS = -lutils -lnewimage -lmiscplot -lmiscpic -lmiscmaths -lavwio -lnewmat -lprob -lm  -lgdc -lgd -lpng -lz
 
 TOBJS = test.o