Restrict make-specific targets to only be added with make
Merged make build fix from core
Fixed crash when emitting empty node