Makefile & related 3rd libs
merge