This should now work after the change to Makefile.am