Add subdir-objects to automate options