Cleaned up the makefile.m4 stuff to create two binaries