Explicitly use subdir-objects in automake init
Merge branch 'upstream' of https://github.com/dererk/vagent2 into dererk-upstream

Conflicts:
	configure.ac