From 4b36180d3b6af989b46015f3e4da3d9181543fa0 Mon Sep 17 00:00:00 2001
From: "Penn, John M 047828115" <john.m.penn@nasa.gov>
Date: Mon, 28 Sep 2020 18:14:23 -0500
Subject: [PATCH] Update SAIntegrator_unittest Makefile

---
 trick_source/trick_utils/SAIntegrator/test/Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/trick_source/trick_utils/SAIntegrator/test/Makefile b/trick_source/trick_utils/SAIntegrator/test/Makefile
index 7d7e7b26..5b6aba88 100644
--- a/trick_source/trick_utils/SAIntegrator/test/Makefile
+++ b/trick_source/trick_utils/SAIntegrator/test/Makefile
@@ -2,10 +2,8 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 RM = rm -rf
-CC = cc
-CPP = c++
 
-CFLAGS = -g -Wall
+TRICK_CPPFLAGS += -I$(GTEST_HOME)/include -I$(TRICK_HOME)/include -g -Wall -Wextra -DGTEST_HAS_TR1_TUPLE=0 ${TRICK_SYSTEM_CXXFLAGS}
 INCLUDE_DIRS = -I../include -I$(GTEST_HOME)/include
 
 SAI_OBJDIR = obj
@@ -21,10 +19,10 @@ test: SAIntegrator_unittest
 	./SAIntegrator_unittest --gtest_output=xml:${TRICK_HOME}/trick_test/SAIntegrator_unittest.xml
 
 SAIntegrator_unittest.o : SAIntegrator_unittest.cc
-	$(CPP) $(CFLAGS) $(INCLUDE_DIRS) -c $<
+	$(TRICK_CXX) $(TRICK_CPPFLAGS) $(INCLUDE_DIRS) -c $<
 
 SAIntegrator_unittest : ${SAI_LIBDIR}/${SAI_LIBNAME} SAIntegrator_unittest.o
-	$(CPP) $(CFLAGS) -o $@ $^ ${LIBDIRS} -lSAInteg -lgtest -lgtest_main -lpthread
+	$(TRICK_CXX) $(TRICK_CPPFLAGS) -o $@ $^ ${LIBDIRS} -lSAInteg -lgtest -lgtest_main -lpthread
 
 ${SAI_LIBDIR}/${SAI_LIBNAME} :
 	$(MAKE) -C ..