Merge pull request #1740 from rubenk/correct-am_cflags