Remove CERN-specific if-def, tidy up code slightly
Remove unnecessary libdiagnose link

The configuration script adds libdiagnose to the EXTRALIBS variable
if it is found.  Despite including EXRALIBS, this Makefile
hard-codes a dependency on libdiagnose.  This is both unnecessary
and causes the build to fail if libdiagnose is missing.