Merge pull request #642 from adminempire/unstable

Finishing cleaning up libdaq-static