Major change for compilation with GNU Make