Code

Makefile: rearrange dependency rules