trellis_generated.i and Makefile.gen need not be under version control...