For the tutorial the old Makefiles are saved as Makefile.simple in all the respective directories. Use generated config.h instead of command-line passing of preprocessor flags. Updated support files from current automake.