input.Makefile: Renamed "...-%" targets to "%/..." so they are more logically associated with a specific subdir
input.Makefile: Renamed "...-%" targets to "%/..." so they are more logically associated with a specific subdir