GitLab

so the build rules don't depend on global variables that may be modified
later in other makefiles.
Also fixed an error introduced by the previous cleanup change.

Change-Id: I2cecc94f06433bb594e3eff3f429f4d65e217f25