Index: src/unittests/Makefile.am
===================================================================
--- src/unittests/Makefile.am	(revision 2ba827e737ea7333505df6e2640b2fab96158b1b)
+++ src/unittests/Makefile.am	(revision 4d9c01f8014759f2f19a4f8d375d102f00f3be13)
@@ -35,72 +35,75 @@
 noinst_PROGRAMS = $(TESTS)
 
+GSLLIBS = ../libgslwrapper.a
+ALLLIBS = ../libmolecuilder.a ${GSLLIBS} $(BOOST_LIB) ${BOOST_THREAD_LIB}
+
 ActOnAllUnitTest_SOURCES = ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
-ActOnAllUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+ActOnAllUnitTest_LDADD = ${ALLLIBS}
 
 AnalysisBondsUnitTests_SOURCES = analysisbondsunittest.cpp analysisbondsunittest.hpp
-AnalysisBondsUnitTests_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+AnalysisBondsUnitTests_LDADD = ${ALLLIBS}
 
 AnalysisCorrelationToPointUnitTest_SOURCES = analysis_correlation.hpp AnalysisCorrelationToPointUnitTest.cpp AnalysisCorrelationToPointUnitTest.hpp
-AnalysisCorrelationToPointUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+AnalysisCorrelationToPointUnitTest_LDADD = ${ALLLIBS}
 
 AnalysisCorrelationToSurfaceUnitTest_SOURCES = analysis_correlation.hpp AnalysisCorrelationToSurfaceUnitTest.cpp AnalysisCorrelationToSurfaceUnitTest.hpp
-AnalysisCorrelationToSurfaceUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+AnalysisCorrelationToSurfaceUnitTest_LDADD = ${ALLLIBS}
 
 AnalysisPairCorrelationUnitTest_SOURCES = analysis_correlation.hpp AnalysisPairCorrelationUnitTest.cpp AnalysisPairCorrelationUnitTest.hpp
-AnalysisPairCorrelationUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+AnalysisPairCorrelationUnitTest_LDADD = ${ALLLIBS}
 
 BondGraphUnitTest_SOURCES = bondgraphunittest.cpp bondgraphunittest.hpp
-BondGraphUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+BondGraphUnitTest_LDADD = ${ALLLIBS}
 
 GSLMatrixSymmetricUnitTest_SOURCES = gslmatrixsymmetricunittest.cpp gslmatrixsymmetricunittest.hpp
-GSLMatrixSymmetricUnitTest_LDADD = ../libgslwrapper.a
+GSLMatrixSymmetricUnitTest_LDADD = ${GSLLIBS}
 
 GSLMatrixUnitTest_SOURCES = gslmatrixunittest.cpp gslmatrixunittest.hpp
-GSLMatrixUnitTest_LDADD = ../libgslwrapper.a
+GSLMatrixUnitTest_LDADD = ${GSLLIBS}
 
 GSLVectorUnitTest_SOURCES = gslvectorunittest.cpp gslvectorunittest.hpp
-GSLVectorUnitTest_LDADD = ../libgslwrapper.a
+GSLVectorUnitTest_LDADD = ${GSLLIBS}
 
 InfoUnitTest_SOURCES = infounittest.cpp infounittest.hpp
-InfoUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+InfoUnitTest_LDADD = ${ALLLIBS}
 
 LinearSystemOfEquationsUnitTest_SOURCES = linearsystemofequationsunittest.cpp linearsystemofequationsunittest.hpp
-LinearSystemOfEquationsUnitTest_LDADD = ../libgslwrapper.a ../libmolecuilder.a
+LinearSystemOfEquationsUnitTest_LDADD = ${ALLLIBS}
 
 ListOfBondsUnitTest_SOURCES = listofbondsunittest.cpp listofbondsunittest.hpp
-ListOfBondsUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+ListOfBondsUnitTest_LDADD = ${ALLLIBS}
 
 LogUnitTest_SOURCES = logunittest.cpp logunittest.hpp 
-LogUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+LogUnitTest_LDADD = ${ALLLIBS}
 
 MemoryAllocatorUnitTest_SOURCES = memoryallocatorunittest.cpp memoryallocatorunittest.hpp 
-MemoryAllocatorUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+MemoryAllocatorUnitTest_LDADD = ${ALLLIBS}
 
 MemoryUsageObserverUnitTest_SOURCES = memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp 
-MemoryUsageObserverUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+MemoryUsageObserverUnitTest_LDADD = ${ALLLIBS}
 
 StackClassUnitTest_SOURCES = stackclassunittest.cpp stackclassunittest.hpp
-StackClassUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+StackClassUnitTest_LDADD = ${ALLLIBS}
 
 TesselationUnitTest_SOURCES = tesselationunittest.cpp tesselationunittest.hpp
-TesselationUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+TesselationUnitTest_LDADD = ${ALLLIBS}
 
 Tesselation_BoundaryTriangleUnitTest_SOURCES = tesselation_boundarytriangleunittest.cpp tesselation_boundarytriangleunittest.hpp
-Tesselation_BoundaryTriangleUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+Tesselation_BoundaryTriangleUnitTest_LDADD = ${ALLLIBS}
 
 Tesselation_InOutsideUnitTest_SOURCES = tesselation_insideoutsideunittest.cpp tesselation_insideoutsideunittest.hpp
-Tesselation_InOutsideUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+Tesselation_InOutsideUnitTest_LDADD = ${ALLLIBS}
 
 VectorUnitTest_SOURCES = vectorunittest.cpp vectorunittest.hpp 
-VectorUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+VectorUnitTest_LDADD = ${ALLLIBS}
 
 ActionSequenceTest_SOURCES = ActionSequenceTest.cpp ActionSequenceTest.hpp
-ActionSequenceTest_LDADD = ../libmolecuilder.a
+ActionSequenceTest_LDADD = ${ALLLIBS}
 
 ObserverTest_SOURCES = ObserverTest.cpp ObserverTest.hpp
-ObserverTest_LDADD = ../libmolecuilder.a
+ObserverTest_LDADD = ${ALLLIBS}
 
 CacheableTest_SOURCES = CacheableTest.cpp CacheableTest.hpp
-CacheableTest_LDADD = ../libmolecuilder.a
+CacheableTest_LDADD = ${ALLLIBS}
 
 #AUTOMAKE_OPTIONS = parallel-tests
