Solve linker load order on linux

Author: Zachary Crockett

Makefile

@@ -1,7 +1,6 @@
 CXX ?= g++
 CXXFLAGS ?= -g -Wall -W -Winline -ansi
 CXXFLAGS += -Ilib/tropicssl/include -Isrc -Itests/UnitTest++/src
-LDFLAGS ?=
 RM = rm
 
 .SUFFIXES: .o .cpp
@@ -10,7 +9,8 @@ name        = SparkCoreCommunication
 lib         = src/lib$(name).a
 test        = tests/test$(name)
 testlibdir  = tests/UnitTest++
-testlib     = $(testlibdir)/libUnitTest++.a
+testlib     = UnitTest++
+testlibpath = $(testlibdir)/lib$(testlib).a
 testrunner  = tests/Main.cpp
 ssllibdir   = lib/tropicssl/library
 ssllib      = $(ssllibdir)/libtropicssl.a
@@ -31,6 +31,7 @@ testobjects = tests/ConstructorFixture.o \
               tests/TestUserFunctions.o \
               tests/TestEvents.o
 
+LDFLAGS ?= -L$(ssllibdir) -ltropicssl -Lsrc -l$(name) -L$(testlibdir) -l$(testlib)
 
 all: $(lib)
 
@@ -47,13 +48,12 @@ clean:
 
 ############### tests #############
 
-test: $(lib) $(testlib) $(testobjects) $(ssllib)
-	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(test) $(testlib) \
-    $(lib) $(ssllib) $(testobjects) $(testrunner)
+test: $(lib) $(testlibpath) $(testobjects) $(ssllib)
+	@$(CXX) $(testrunner) $(CXXFLAGS) $(testobjects) $(LDFLAGS) -o $(test)
 	@echo running unit tests...
 	@./$(test)
 
-$(testlib):
+$(testlibpath):
 	$(MAKE) -C $(testlibdir)
 
 testclean:

tests/TestAES.cpp

@@ -1,3 +1,5 @@
+#include <stdint.h>
+#include <string.h>
 #include "UnitTest++.h"
 #include "tropicssl/aes.h"
 

tests/TestDescriptor.cpp

@@ -1,3 +1,4 @@
+#include <string.h>
 #include "UnitTest++.h"
 #include "spark_descriptor.h"
 

tests/TestEvents.cpp

@@ -22,6 +22,7 @@
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
   ******************************************************************************
   */
+#include <string.h>
 #include "UnitTest++.h"
 #include "events.h"
 

tests/TestHandshake.cpp

@@ -1,3 +1,4 @@
+#include <stdint.h>
 #include "UnitTest++.h"
 #include "handshake.h"
 #include "tropicssl/rsa.h"

tests/UnitTest++/src/UnitTest++.h

@@ -3,9 +3,6 @@
 
 //lint -esym(1509,*Fixture)
 
-#include <stdint.h>
-#include <string.h>
-
 #include "Config.h"
 #include "Test.h"
 #include "TestList.h"