Modify makefile and delete wildcard support