improved Makefile

now also re-genrates swig.h and always runs targets.
Merge remote-tracking branch 'upstream/master'