Restructure elisp/Makefile

The old Makefile used to rebuild .elc files on each run, and it also
tried to remove .elc files before they existed. To fix that, restructure
the Makefile.
Put everything back in one file, it was a mistake to try to split it