diff --git a/trick_sims/SIM_satellite/models/Satellite/graphics/makefile b/trick_sims/SIM_satellite/models/Satellite/graphics/makefile index d740f15d..231700b4 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 02327e19..14af12b1 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 9a5c2bba..c863277a 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 2f4a2c0f..2f9483ce 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 diff --git a/trick_sims/SIM_wheelbot/models/Guidance/test/makefile b/trick_sims/SIM_wheelbot/models/Guidance/test/makefile index ef9af3b3..8372803b 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 75df7558..54e63538 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 9a5c2bba..c863277a 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 a86e07f0..a56fabd4 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 bac734a4..480cc1ec 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 = gcc +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 4c299855..e36352be 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 = gcc +CPP = c++ DPX_DIR = ../.. diff --git a/trick_source/data_products/DPX/DPC/makefile b/trick_source/data_products/DPX/DPC/makefile index 68313712..14e3984a 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 = gcc +CPP = c++ DPX_DIR = .. diff --git a/trick_source/data_products/DPX/DPM/makefile b/trick_source/data_products/DPX/DPM/makefile index 928d9a7d..a6fb2c76 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 = gcc +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 a66a1395..58ff0734 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 b3811928..3887d161 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 = gcc 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 80ef052f..14fbfb53 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 c64f0206..44eb5a0e 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 cc58921d..42d7ac90 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 = gcc +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 c240c9cf..c18d9b8e 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 = gcc +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 e436645d..0e628f44 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 d0f29f28..8c14f0b0 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 05daf637..3bf6eb8d 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 6e19d246..c136ed78 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 f111ac6e..835703aa 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 b41d4f8a..bda3abb5 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 e16bc20a..5d155c26 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 2a7ed210..98506b78 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 = gcc +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 1328f389..92cd9b99 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 45dda6f0..a29f43ea 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 3ecd1271..11db671d 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 = gcc +CPP = c++ CURL = curl MV = mv CP = cp