diff --git a/trick_sims/SIM_satellite/models/Satellite/graphics/makefile b/trick_sims/SIM_satellite/models/Satellite/graphics/makefile index 231700b49..d740f15d4 100644 --- a/trick_sims/SIM_satellite/models/Satellite/graphics/makefile +++ b/trick_sims/SIM_satellite/models/Satellite/graphics/makefile @@ -1,5 +1,5 @@ -CPP = g++ -CC = gcc +CPP ?= g++ +CC ?= gcc ifeq ($(shell uname), Darwin) GL_LIBS = -framework GLUT -framework OpenGL diff --git a/trick_sims/SIM_wheelbot/models/Battery/test/makefile b/trick_sims/SIM_wheelbot/models/Battery/test/makefile index 14af12b1a..02327e19c 100644 --- a/trick_sims/SIM_wheelbot/models/Battery/test/makefile +++ b/trick_sims/SIM_wheelbot/models/Battery/test/makefile @@ -1,8 +1,8 @@ RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ DECL_DIR = .. GTEST_DIR = ${HOME}/gtest-1.7.0 diff --git a/trick_sims/SIM_wheelbot/models/Control/test/makefile b/trick_sims/SIM_wheelbot/models/Control/test/makefile index c863277a9..9a5c2bba7 100644 --- a/trick_sims/SIM_wheelbot/models/Control/test/makefile +++ b/trick_sims/SIM_wheelbot/models/Control/test/makefile @@ -1,6 +1,6 @@ RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ PROJECT_DIR = ../.. diff --git a/trick_sims/SIM_wheelbot/models/Electrical/test/makefile b/trick_sims/SIM_wheelbot/models/Electrical/test/makefile index 6feffff61..2f4a2c0f3 100644 --- a/trick_sims/SIM_wheelbot/models/Electrical/test/makefile +++ b/trick_sims/SIM_wheelbot/models/Electrical/test/makefile @@ -1,6 +1,6 @@ RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ DECL_DIR = .. GTEST_DIR = ${HOME}/gtest-1.7.0 @@ -38,4 +38,4 @@ ElectricalCircuitTest.o : ElectricalCircuitTest.cpp ElectricalCircuitTest : ElectricalCircuitTest.o gtest_main.o gtest-all.o $(CPP) $(CFLAGS) -o $@ $^ $(LIBS) - \ No newline at end of file + diff --git a/trick_sims/SIM_wheelbot/models/Guidance/test/makefile b/trick_sims/SIM_wheelbot/models/Guidance/test/makefile index 8372803be..ef9af3b34 100644 --- a/trick_sims/SIM_wheelbot/models/Guidance/test/makefile +++ b/trick_sims/SIM_wheelbot/models/Guidance/test/makefile @@ -1,8 +1,8 @@ RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ DECL_DIR = .. GTEST_DIR = ${HOME}/gtest-1.7.0 diff --git a/trick_sims/SIM_wheelbot/models/Motor/test/makefile b/trick_sims/SIM_wheelbot/models/Motor/test/makefile index 54e635385..75df75583 100644 --- a/trick_sims/SIM_wheelbot/models/Motor/test/makefile +++ b/trick_sims/SIM_wheelbot/models/Motor/test/makefile @@ -1,7 +1,7 @@ RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ DECL_DIR = .. GTEST_DIR = ${HOME}/gtest-1.7.0 diff --git a/trick_sims/SIM_wheelbot/models/Motor/test/test/makefile b/trick_sims/SIM_wheelbot/models/Motor/test/test/makefile index c863277a9..9a5c2bba7 100644 --- a/trick_sims/SIM_wheelbot/models/Motor/test/test/makefile +++ b/trick_sims/SIM_wheelbot/models/Motor/test/test/makefile @@ -1,6 +1,6 @@ RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ PROJECT_DIR = ../.. diff --git a/trick_source/data_products/Apps/ExternalPrograms/makefile b/trick_source/data_products/Apps/ExternalPrograms/makefile index a56fabd45..a86e07f08 100644 --- a/trick_source/data_products/Apps/ExternalPrograms/makefile +++ b/trick_source/data_products/Apps/ExternalPrograms/makefile @@ -1,4 +1,4 @@ -CC = gcc +CC ?= gcc ifndef TRICK_HOST_CPU TRICK_HOST_CPU := $(shell trick-gte TRICK_HOST_CPU) @@ -34,7 +34,7 @@ TRICK_CFLAGS += -Wall endif ifeq ($(TRICK_HOST_TYPE),Darwin) -CC = cc +CC ?= cc LD_SHARED = $(CC) -bundle TRICK_CFLAGS += -Wall endif diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/makefile b/trick_source/data_products/DPX/APPS/FXPLOT/makefile index b3bb90b1f..bac734a48 100644 --- a/trick_source/data_products/DPX/APPS/FXPLOT/makefile +++ b/trick_source/data_products/DPX/APPS/FXPLOT/makefile @@ -2,8 +2,8 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ DPX_DIR = ../.. diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/makefile b/trick_source/data_products/DPX/APPS/GXPLOT/makefile index e23337c54..4c299855d 100644 --- a/trick_source/data_products/DPX/APPS/GXPLOT/makefile +++ b/trick_source/data_products/DPX/APPS/GXPLOT/makefile @@ -2,8 +2,8 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ DPX_DIR = ../.. diff --git a/trick_source/data_products/DPX/DPC/makefile b/trick_source/data_products/DPX/DPC/makefile index 24e34a72a..683137124 100644 --- a/trick_source/data_products/DPX/DPC/makefile +++ b/trick_source/data_products/DPX/DPC/makefile @@ -2,8 +2,8 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ DPX_DIR = .. diff --git a/trick_source/data_products/DPX/DPM/makefile b/trick_source/data_products/DPX/DPM/makefile index 2b67ccd1b..928d9a7d2 100644 --- a/trick_source/data_products/DPX/DPM/makefile +++ b/trick_source/data_products/DPX/DPM/makefile @@ -2,8 +2,8 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ DPX_DIR = .. diff --git a/trick_source/data_products/DPX/DPV/UTILS/makefile b/trick_source/data_products/DPX/DPV/UTILS/makefile index 58ff07342..a66a1395a 100644 --- a/trick_source/data_products/DPX/DPV/UTILS/makefile +++ b/trick_source/data_products/DPX/DPV/UTILS/makefile @@ -2,8 +2,8 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common RM = rm -rf -CC = gcc -CPP = g++ +CC ?= gcc +CPP ?= g++ DPX_DIR = ../.. diff --git a/trick_source/data_products/EQParse/makefile b/trick_source/data_products/EQParse/makefile index 6a5cc3bd3..b38119287 100644 --- a/trick_source/data_products/EQParse/makefile +++ b/trick_source/data_products/EQParse/makefile @@ -1,7 +1,7 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common -CC = cc +CC ?= cc OBJ_DIR = object_${TRICK_HOST_CPU} LIBDIR = ../lib_${TRICK_HOST_CPU} diff --git a/trick_source/data_products/Log/makefile b/trick_source/data_products/Log/makefile index f4a209a29..80ef052ff 100644 --- a/trick_source/data_products/Log/makefile +++ b/trick_source/data_products/Log/makefile @@ -1,7 +1,7 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common -CC = c++ +CC ?= c++ ifndef TRICK_HOST_CPU TRICK_HOST_CPU := $(shell uname -s) diff --git a/trick_source/data_products/Var/makefile b/trick_source/data_products/Var/makefile index 44eb5a0e1..c64f0206a 100644 --- a/trick_source/data_products/Var/makefile +++ b/trick_source/data_products/Var/makefile @@ -1,7 +1,7 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common -CC = c++ +CC ?= c++ ifndef TRICK_HOST_CPU TRICK_HOST_CPU := $(shell uname -s) diff --git a/trick_source/data_products/units/makefile b/trick_source/data_products/units/makefile index 20f28d6ca..cc58921d7 100644 --- a/trick_source/data_products/units/makefile +++ b/trick_source/data_products/units/makefile @@ -1,8 +1,8 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ ifndef TRICK_HOST_CPU TRICK_HOST_CPU := $(shell uname -s) diff --git a/trick_source/sim_services/DataTypes/makefile b/trick_source/sim_services/DataTypes/makefile index b5050c78f..c240c9cf2 100644 --- a/trick_source/sim_services/DataTypes/makefile +++ b/trick_source/sim_services/DataTypes/makefile @@ -1,7 +1,7 @@ RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ CFLAGS = -g -Wall diff --git a/trick_source/trick_utils/SAIntegrator/examples/AsteroidFlyBy/makefile b/trick_source/trick_utils/SAIntegrator/examples/AsteroidFlyBy/makefile index 0e628f449..e436645d9 100644 --- a/trick_source/trick_utils/SAIntegrator/examples/AsteroidFlyBy/makefile +++ b/trick_source/trick_utils/SAIntegrator/examples/AsteroidFlyBy/makefile @@ -1,7 +1,7 @@ RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ CXXFLAGS = -g -Wall INCLUDE_DIRS = -I../../include diff --git a/trick_source/trick_utils/SAIntegrator/examples/BouncyCannonBall/makefile b/trick_source/trick_utils/SAIntegrator/examples/BouncyCannonBall/makefile index 8c14f0b09..d0f29f28f 100644 --- a/trick_source/trick_utils/SAIntegrator/examples/BouncyCannonBall/makefile +++ b/trick_source/trick_utils/SAIntegrator/examples/BouncyCannonBall/makefile @@ -1,7 +1,7 @@ RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ CXXFLAGS = -g -Wall INCLUDE_DIRS = -I../../include diff --git a/trick_source/trick_utils/SAIntegrator/examples/CannonBall/makefile b/trick_source/trick_utils/SAIntegrator/examples/CannonBall/makefile index 3bf6eb8d1..05daf637d 100644 --- a/trick_source/trick_utils/SAIntegrator/examples/CannonBall/makefile +++ b/trick_source/trick_utils/SAIntegrator/examples/CannonBall/makefile @@ -1,7 +1,7 @@ RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ CXXFLAGS = -g -Wall INCLUDE_DIRS = -I../../include diff --git a/trick_source/trick_utils/SAIntegrator/examples/DefiniteIntegral/makefile b/trick_source/trick_utils/SAIntegrator/examples/DefiniteIntegral/makefile index c136ed780..6e19d246d 100644 --- a/trick_source/trick_utils/SAIntegrator/examples/DefiniteIntegral/makefile +++ b/trick_source/trick_utils/SAIntegrator/examples/DefiniteIntegral/makefile @@ -1,7 +1,7 @@ RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ CXXFLAGS = -g -Wall INCLUDE_DIRS = -I../../include diff --git a/trick_source/trick_utils/SAIntegrator/examples/DoubleIntegral/makefile b/trick_source/trick_utils/SAIntegrator/examples/DoubleIntegral/makefile index 835703aae..f111ac6e4 100644 --- a/trick_source/trick_utils/SAIntegrator/examples/DoubleIntegral/makefile +++ b/trick_source/trick_utils/SAIntegrator/examples/DoubleIntegral/makefile @@ -1,7 +1,7 @@ RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ CXXFLAGS = -g -Wall INCLUDE_DIRS = -I../../include diff --git a/trick_source/trick_utils/SAIntegrator/examples/MassSpringDamper/makefile b/trick_source/trick_utils/SAIntegrator/examples/MassSpringDamper/makefile index bda3abb51..b41d4f8a6 100644 --- a/trick_source/trick_utils/SAIntegrator/examples/MassSpringDamper/makefile +++ b/trick_source/trick_utils/SAIntegrator/examples/MassSpringDamper/makefile @@ -1,7 +1,7 @@ RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ CXXFLAGS = -g -Wall INCLUDE_DIRS = -I../../include diff --git a/trick_source/trick_utils/SAIntegrator/examples/Orbit/makefile b/trick_source/trick_utils/SAIntegrator/examples/Orbit/makefile index 5d155c261..e16bc20a3 100644 --- a/trick_source/trick_utils/SAIntegrator/examples/Orbit/makefile +++ b/trick_source/trick_utils/SAIntegrator/examples/Orbit/makefile @@ -1,7 +1,7 @@ RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ CXXFLAGS = -g -Wall INCLUDE_DIRS = -I../../include diff --git a/trick_source/trick_utils/SAIntegrator/makefile b/trick_source/trick_utils/SAIntegrator/makefile index cdd6eaeb9..2a7ed210f 100644 --- a/trick_source/trick_utils/SAIntegrator/makefile +++ b/trick_source/trick_utils/SAIntegrator/makefile @@ -1,7 +1,7 @@ RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ CFLAGS = -g -Wall -std=c++11 ${TRICK_CXXFLAGS} INCLUDE_DIRS = -Iinclude diff --git a/trick_source/trick_utils/comm/test_programs/makefile b/trick_source/trick_utils/comm/test_programs/makefile index f1739a412..1328f3891 100644 --- a/trick_source/trick_utils/comm/test_programs/makefile +++ b/trick_source/trick_utils/comm/test_programs/makefile @@ -20,7 +20,7 @@ TRICK_HOST_TYPE := $(shell trick-gte TRICK_HOST_TYPE) endif -CC = cc +CC ?= cc FLAGS = ifeq ($(TRICK_HOST_TYPE), Darwin) LIBS = diff --git a/trick_source/trick_utils/units/Unittest/makefile b/trick_source/trick_utils/units/Unittest/makefile index a29f43eae..45dda6f07 100644 --- a/trick_source/trick_utils/units/Unittest/makefile +++ b/trick_source/trick_utils/units/Unittest/makefile @@ -9,8 +9,8 @@ TRICK_HOST_TYPE := $(shell trick-gte TRICK_HOST_TYPE) endif -CC = gcc -CPP = g++ +CC ?= gcc +CPP ?= g++ CFLAGS = -g -Wall -I../include diff --git a/trick_source/web/CivetServer/makefile b/trick_source/web/CivetServer/makefile index fce4065f4..3ecd1271a 100644 --- a/trick_source/web/CivetServer/makefile +++ b/trick_source/web/CivetServer/makefile @@ -1,8 +1,8 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common RM = rm -rf -CC = cc -CPP = c++ +CC ?= cc +CPP ?= c++ CURL = curl MV = mv CP = cp