Update Makefile to include pbcpputils and pbihdftools