Have you submitted this Makefile snippet for inclusion upstream?