unify Makefiles a little