From 497f11f132f02477f99ff366d4e33951aa7dc6bd Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Tue, 18 Jun 2019 11:00:08 -0500 Subject: [PATCH] Make TRICK_CXX variable to specify c++ compiler #767 (#815) Changed all references of TRICK_CPPC to TRICK_CXX. Added a warning message that TRICK_CPPC has been deprecated. --- Makefile | 2 +- bin/trick-CP | 2 +- libexec/trick/make_makefile_src | 6 +- libexec/trick/make_makefile_swig | 2 +- libexec/trick/pm/gte.pm | 2 +- share/trick/makefiles/Makefile.common | 12 ++- share/trick/makefiles/Makefile.tricklib | 18 ++-- share/trick/makefiles/trickify.mk | 6 +- .../Interface_Code_Gen/HeaderSearchDirs.cpp | 4 +- .../Interface_Code_Gen/HeaderSearchDirs.hh | 2 +- .../Interface_Code_Gen/PrintAttributes.cpp | 2 +- trick_source/sim_services/Clock/test/Makefile | 14 ++-- .../sim_services/Executive/test/Makefile | 4 +- .../sim_services/Integrator/test/Makefile | 4 +- .../JITInputFile/JITInputFile.cpp | 4 +- .../sim_services/MemoryManager/test/Makefile | 82 +++++++++---------- .../sim_services/MonteCarlo/test/Makefile | 8 +- .../ScheduledJobQueue/test/Makefile | 4 +- trick_source/sim_services/Timer/test/Makefile | 4 +- trick_source/sim_services/mains/Makefile | 4 +- trick_source/trick_swig/Makefile | 4 +- trick_source/trick_utils/comm/test/Makefile | 2 +- .../trick_utils/interpolator/test/Makefile | 4 +- .../trick_utils/math/Unittest/makefile | 2 +- trick_source/trick_utils/math/test/Makefile | 4 +- .../trick_utils/unicode/test/Makefile | 4 +- .../trick_utils/units/Unittest/makefile | 2 +- trick_source/trick_utils/units/test/makefile | 12 +-- 28 files changed, 113 insertions(+), 107 deletions(-) diff --git a/Makefile b/Makefile index 6b0192b5..fd8c8744 100644 --- a/Makefile +++ b/Makefile @@ -406,7 +406,7 @@ ICG: $(ICG_EXE) # This builds a tricklib share library. trick_lib: $(SIM_SERV_DIRS) $(UTILS_DIRS) | $(TRICK_LIB_DIR) - ${TRICK_CPPC} $(SHARED_LIB_OPT) -o ${TRICK_LIB_DIR}/libtrick.so $(SIM_SERV_OBJS) $(UTILS_OBJS) + ${TRICK_CXX} $(SHARED_LIB_OPT) -o ${TRICK_LIB_DIR}/libtrick.so $(SIM_SERV_OBJS) $(UTILS_OBJS) # For NASA/JSC developers include optional rules -include Makefile_jsc_dirs diff --git a/bin/trick-CP b/bin/trick-CP index 4c6c7caa..9ad1e87e 100755 --- a/bin/trick-CP +++ b/bin/trick-CP @@ -191,7 +191,7 @@ S_source.hh: S_define | build build/Makefile_S_define: S_source.hh $(PRINT_S_DEF_DEPS) - $(call ECHO_AND_LOG,$(TRICK_CPPC) $(TRICK_SFLAGS) $(TRICK_SYSTEM_SFLAGS) -MM -MT S_source.hh -MF build/Makefile_S_define -x c++ S_define) + $(call ECHO_AND_LOG,$(TRICK_CXX) $(TRICK_SFLAGS) $(TRICK_SYSTEM_SFLAGS) -MM -MT S_source.hh -MF build/Makefile_S_define -x c++ S_define) # Automatic and manual ICG rules ICG: diff --git a/libexec/trick/make_makefile_src b/libexec/trick/make_makefile_src index 06f17a6b..8002abb1 100755 --- a/libexec/trick/make_makefile_src +++ b/libexec/trick/make_makefile_src @@ -237,7 +237,7 @@ S_OBJECTS = build/S_source.o build/S_source.o: build/S_source.cpp | build/S_source.d \t\$(PRINT_COMPILE) -\t\$(call ECHO_AND_LOG,\$(TRICK_CPPC) \$(TRICK_CXXFLAGS) \$(TRICK_SYSTEM_CXXFLAGS) -MMD -MP -c -o \$\@ \$\<) +\t\$(call ECHO_AND_LOG,\$(TRICK_CXX) \$(TRICK_CXXFLAGS) \$(TRICK_SYSTEM_CXXFLAGS) -MMD -MP -c -o \$\@ \$\<) build/S_source.d: ; @@ -286,7 +286,7 @@ print MAKEFILE " .SECONDEXPANSION:" ; foreach my $extension ( keys %files_by_extension ) { - my $compiler = "TRICK_" . ($extension eq ".c" ? "CC" : "CPPC") ; + my $compiler = "TRICK_" . ($extension eq ".c" ? "CC" : "CXX") ; my $flags = $extension eq ".c" ? "C" : "CXX" ; my $command = "\$($compiler) \$(TRICK_${flags}FLAGS) \$(TRICK_SYSTEM_${flags}FLAGS) -I\$(> $(DEPTEMPFILE) + @ $(TRICK_CXX) -MM $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) $(C_SRC) $(CPP_SRC) >> $(DEPTEMPFILE) @ $(PERL) ${TRICK_HOME}/$(LIBEXEC)/trick/depend_cp $(DEPTEMPFILE) > $(DEPFILE) @ $(RM) $(DEPTEMPFILE) @ echo "Created dependency file $(DEPFILE)" diff --git a/share/trick/makefiles/trickify.mk b/share/trick/makefiles/trickify.mk index 1e9fb681..f122b6a5 100644 --- a/share/trick/makefiles/trickify.mk +++ b/share/trick/makefiles/trickify.mk @@ -116,7 +116,7 @@ $(TRICKIFY_OBJECT_NAME): $(SWIG_OBJECTS) $(IO_OBJECTS) | $(dir $(TRICKIFY_OBJECT ifeq ($(TRICKIFY_BUILD_TYPE),PLO) $(call ECHO_AND_LOG,$(LD) $(LD_PARTIAL) -o $@ $^) else ifeq ($(TRICKIFY_BUILD_TYPE),SHARED) - $(call ECHO_AND_LOG,$(TRICK_CPPC) -shared -o $@ $^) + $(call ECHO_AND_LOG,$(TRICK_CXX) -shared -o $@ $^) else ifeq ($(TRICKIFY_BUILD_TYPE),STATIC) $(call ECHO_AND_LOG,ar rcs $@ $^) endif @@ -126,7 +126,7 @@ $(dir $(TRICKIFY_OBJECT_NAME)) $(TRICKIFY_PYTHON_DIR) $(BUILD_DIR): $(IO_OBJECTS): %.o: %.cpp $(info $(call COLOR,Compiling) $<) - $(call ECHO_AND_LOG,$(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -std=c++11 -Wno-invalid-offsetof -MMD -MP -c -o $@ $<) + $(call ECHO_AND_LOG,$(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -std=c++11 -Wno-invalid-offsetof -MMD -MP -c -o $@ $<) $(IO_OBJECTS:.o=.d): %.d: ; @@ -134,7 +134,7 @@ $(IO_OBJECTS:.o=.d): %.d: ; $(SWIG_OBJECTS): %.o: %.cpp $(info $(call COLOR,Compiling) $<) - $(call ECHO_AND_LOG,$(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) $(PYTHON_INCLUDES) -Wno-unused-parameter -Wno-shadow -c -o $@ $<) + $(call ECHO_AND_LOG,$(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) $(PYTHON_INCLUDES) -Wno-unused-parameter -Wno-shadow -c -o $@ $<) $(SWIG_OBJECTS:.o=.cpp): %.cpp: %.i | %.d $(TRICKIFY_PYTHON_DIR) $(SWIG_OBJECTS:.o=.i) $(info $(call COLOR,SWIGing) $<) diff --git a/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp b/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp index d713568d..f6ad1b25 100644 --- a/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp +++ b/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp @@ -50,13 +50,13 @@ void HeaderSearchDirs::AddCompilerBuiltInSearchDirs () { } #endif - fp = popen("${TRICK_HOME}/bin/trick-gte TRICK_CPPC" , "r") ; + fp = popen("${TRICK_HOME}/bin/trick-gte TRICK_CXX" , "r") ; fgets(line , sizeof(line) , fp) ; pclose(fp) ; std::string trick_cppc = std::string(line) ; std::string command ; trick_cppc.erase(trick_cppc.find_last_not_of(" \n\r\t")+1) ; - //std::cout << "TRICK_CPPC = " << trick_cppc << std::endl ; + //std::cout << "TRICK_CXX = " << trick_cppc << std::endl ; command = std::string("echo | ") + trick_cppc + std::string(" -v -xc++ -E - 2>&1") ; //std::cout << "command = " << command << std::endl ; diff --git a/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.hh b/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.hh index 7bd11164..c3d31cb6 100644 --- a/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.hh +++ b/trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.hh @@ -130,7 +130,7 @@ class HeaderSearchDirs { /** ${TRICK_HOME}/include/trick resolved */ std::string trick_include_dir ; - /** Adds all of the built-in system paths contained in the TRICK_CPPC compiler */ + /** Adds all of the built-in system paths contained in the TRICK_CXX compiler */ void AddCompilerBuiltInSearchDirs () ; /** Adds all of the paths specified on the command line */ diff --git a/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp b/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp index 2365525d..beb523f2 100644 --- a/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp +++ b/trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp @@ -377,7 +377,7 @@ void PrintAttributes::printIOMakefile() { << std::endl << "$(IO_OBJECTS): \%.o : \%.cpp | \%.d" << std::endl << "\t$(PRINT_COMPILE)" << std::endl - << "\t$(call ECHO_AND_LOG,$(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) $(TRICK_IO_CXXFLAGS) -MMD -MP -c -o $@ $<)" << std::endl + << "\t$(call ECHO_AND_LOG,$(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) $(TRICK_IO_CXXFLAGS) -MMD -MP -c -o $@ $<)" << std::endl << std::endl << "$(IO_OBJECTS:.o=.d): ;" << std::endl << std::endl diff --git a/trick_source/sim_services/Clock/test/Makefile b/trick_source/sim_services/Clock/test/Makefile index c1dc76a4..ceb032ee 100644 --- a/trick_source/sim_services/Clock/test/Makefile +++ b/trick_source/sim_services/Clock/test/Makefile @@ -45,22 +45,22 @@ clean : rm -f $(TESTS) *.o GetTimeOfDayClock_test.o : GetTimeOfDayClock_test.cpp - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< GetTimeOfDayClock_test : ${GETTIMEOFDAY_CLOCK_OBJECTS} - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ ${LIBS} + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ ${LIBS} TPROCTEClock_test.o : TPROCTEClock_test.cpp - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< TPROCTEClock_test : ${TPROCTE_CLOCK_OBJECTS} - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ ${LIBS} + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ ${LIBS} BC635Clock_test.o : BC635Clock_test.cpp - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< BC635Clock_test : ${BC635_CLOCK_OBJECTS} - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ ${LIBS} + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ ${LIBS} exec_get_rt_nap_stub.o : exec_get_rt_nap_stub.cpp - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< diff --git a/trick_source/sim_services/Executive/test/Makefile b/trick_source/sim_services/Executive/test/Makefile index b1b96077..6fc6edb4 100644 --- a/trick_source/sim_services/Executive/test/Makefile +++ b/trick_source/sim_services/Executive/test/Makefile @@ -31,8 +31,8 @@ clean : rm -f $(TESTS) *.o Executive_test.o : Executive_test.cpp - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< Executive_test : Executive_test.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) diff --git a/trick_source/sim_services/Integrator/test/Makefile b/trick_source/sim_services/Integrator/test/Makefile index 67b48e79..46061651 100644 --- a/trick_source/sim_services/Integrator/test/Makefile +++ b/trick_source/sim_services/Integrator/test/Makefile @@ -47,8 +47,8 @@ clean : rm -rf io_src xml Integrator_unittest.o : Integrator_unittest.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< Integrator_unittest : Integrator_unittest.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) diff --git a/trick_source/sim_services/JITInputFile/JITInputFile.cpp b/trick_source/sim_services/JITInputFile/JITInputFile.cpp index 9d57bc98..f738be92 100644 --- a/trick_source/sim_services/JITInputFile/JITInputFile.cpp +++ b/trick_source/sim_services/JITInputFile/JITInputFile.cpp @@ -133,10 +133,10 @@ int Trick::JITInputFile::compile(std::string file_name) { outfile << std::endl << std::endl ; // rule to link shared library outfile << library_fullpath_name << ": " << object_fullpath_name << std::endl ; - outfile << "\t" << get_trick_env((char *)"TRICK_CPPC") << " -shared -o $@ $<" << std::endl << std::endl ; + outfile << "\t" << get_trick_env((char *)"TRICK_CXX") << " -shared -o $@ $<" << std::endl << std::endl ; // rule to compile cpp file outfile << object_fullpath_name << ": " << file_name << std::endl ; - outfile << "\t" << get_trick_env((char *)"TRICK_CPPC") << " " << get_trick_env((char *)"TRICK_CXXFLAGS") ; + outfile << "\t" << get_trick_env((char *)"TRICK_CXX") << " " << get_trick_env((char *)"TRICK_CXXFLAGS") ; outfile << " " << get_trick_env((char *)"TRICK_SYSTEM_CXXFLAGS") ; outfile << " -MMD -c -fPIC -o $@ $<" << std::endl << std::endl ; // rule to clean diff --git a/trick_source/sim_services/MemoryManager/test/Makefile b/trick_source/sim_services/MemoryManager/test/Makefile index ba0d5dc3..71968072 100644 --- a/trick_source/sim_services/MemoryManager/test/Makefile +++ b/trick_source/sim_services/MemoryManager/test/Makefile @@ -91,129 +91,129 @@ clean : io_MM_user_defined_types.o : MM_user_defined_types.hh ${TRICK_HOME}/bin/trick-ICG -s -o ./io_src $(TRICK_CPPFLAGS) $< - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c io_src/io_MM_user_defined_types.cpp + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c io_src/io_MM_user_defined_types.cpp io_MM_alloc_deps.o : MM_alloc_deps.hh ${TRICK_HOME}/bin/trick-ICG -s -o ./io_src $(TRICK_CPPFLAGS) $< - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c io_src/io_MM_alloc_deps.cpp + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c io_src/io_MM_alloc_deps.cpp io_MM_write_checkpoint.o : MM_write_checkpoint.hh ${TRICK_HOME}/bin/trick-ICG -s -o ./io_src $(TRICK_CPPFLAGS) $< - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c io_src/io_MM_write_checkpoint.cpp + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c io_src/io_MM_write_checkpoint.cpp io_MM_get_enumerated.o : MM_get_enumerated.hh ${TRICK_HOME}/bin/trick-ICG -s -o ./io_src $(TRICK_CPPFLAGS) $< - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c io_src/io_MM_get_enumerated.cpp + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c io_src/io_MM_get_enumerated.cpp io_MM_ref_name_from_address.o : MM_ref_name_from_address.hh ${TRICK_HOME}/bin/trick-ICG -s -o ./io_src $(TRICK_CPPFLAGS) $< - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c io_src/io_MM_ref_name_from_address.cpp + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c io_src/io_MM_ref_name_from_address.cpp MM_creation_unittest.o : MM_creation_unittest.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_declare_var_unittest.o : MM_declare_var_unittest.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_declare_var_2_unittest.o : MM_declare_var_2_unittest.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_declare_extern_var_unittest.o : MM_declare_extern_var_unittest.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_delete_var_unittest.o : MM_delete_var_unittest.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_ref_attributes_unittest.o : MM_ref_attributes_unittest.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_resize_array_unittest.o : MM_resize_array_unittest.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_strdup_unittest.o : MM_strdup_unittest.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_write_var_unittest.o : MM_write_var_unittest.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_sizeof_type_unittest.o : MM_sizeof_type_unittest.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_read_checkpoint.o : MM_read_checkpoint.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_clear_var_unittest.o : MM_clear_var_unittest.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_alloc_deps.o : MM_alloc_deps.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_write_checkpoint.o : MM_write_checkpoint.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_get_enumerated.o : MM_get_enumerated.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_ref_name_from_address.o : MM_ref_name_from_address.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_write_checkpoint_hexfloat.o : MM_write_checkpoint_hexfloat.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< Bitfield_tests.o : Bitfield_tests.cpp - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< MM_creation_unittest : MM_creation_unittest.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_declare_var_unittest : MM_declare_var_unittest.o io_MM_user_defined_types.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_declare_var_2_unittest : MM_declare_var_2_unittest.o io_MM_user_defined_types.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_declare_extern_var_unittest : MM_declare_extern_var_unittest.o io_MM_user_defined_types.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_delete_var_unittest : MM_delete_var_unittest.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_ref_attributes_unittest : MM_ref_attributes_unittest.o io_MM_user_defined_types.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_resize_array_unittest : MM_resize_array_unittest.o io_MM_user_defined_types.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_strdup_unittest : MM_strdup_unittest.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_write_var_unittest : MM_write_var_unittest.o io_MM_user_defined_types.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_sizeof_type_unittest : MM_sizeof_type_unittest.o io_MM_user_defined_types.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_read_checkpoint : MM_read_checkpoint.o io_MM_user_defined_types.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_clear_var_unittest : MM_clear_var_unittest.o io_MM_user_defined_types.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_alloc_deps : MM_alloc_deps.o io_MM_alloc_deps.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_write_checkpoint : MM_write_checkpoint.o io_MM_write_checkpoint.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_get_enumerated : MM_get_enumerated.o io_MM_get_enumerated.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_ref_name_from_address : MM_ref_name_from_address.o io_MM_ref_name_from_address.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MM_write_checkpoint_hexfloat : MM_write_checkpoint_hexfloat.o io_MM_write_checkpoint.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) Bitfield_tests : Bitfield_tests.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) diff --git a/trick_source/sim_services/MonteCarlo/test/Makefile b/trick_source/sim_services/MonteCarlo/test/Makefile index da7e0a1c..d246e5ae 100644 --- a/trick_source/sim_services/MonteCarlo/test/Makefile +++ b/trick_source/sim_services/MonteCarlo/test/Makefile @@ -34,13 +34,13 @@ clean : rm -f $(TESTS) *.o MonteCarlo_test.o : MonteCarlo_test.cpp - $(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c $< MonteCarlo_test : MonteCarlo_test.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MonteCarlo_exceptions.o : MonteCarlo_exceptions.cpp - $(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c $< MonteCarlo_exceptions : MonteCarlo_exceptions.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) diff --git a/trick_source/sim_services/ScheduledJobQueue/test/Makefile b/trick_source/sim_services/ScheduledJobQueue/test/Makefile index da827eb9..1cee3de0 100644 --- a/trick_source/sim_services/ScheduledJobQueue/test/Makefile +++ b/trick_source/sim_services/ScheduledJobQueue/test/Makefile @@ -30,8 +30,8 @@ clean : rm -f $(TESTS) *.o ScheduledJobQueue_test.o : ScheduledJobQueue_test.cpp - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< ScheduledJobQueue_test : ScheduledJobQueue_test.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) diff --git a/trick_source/sim_services/Timer/test/Makefile b/trick_source/sim_services/Timer/test/Makefile index 4a1b4768..a2be90ab 100644 --- a/trick_source/sim_services/Timer/test/Makefile +++ b/trick_source/sim_services/Timer/test/Makefile @@ -30,8 +30,8 @@ clean : rm -f $(TESTS) *.o ITimer_test.o : ITimer_test.cpp - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< ITimer_test : ITimer_test.o - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) diff --git a/trick_source/sim_services/mains/Makefile b/trick_source/sim_services/mains/Makefile index 4aef7386..810f97e4 100644 --- a/trick_source/sim_services/mains/Makefile +++ b/trick_source/sim_services/mains/Makefile @@ -8,7 +8,7 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib #trick: $(TRICK_LIB_DIR)/master.o # #$(OBJ_DIR)/master.o : master.cpp | $(OBJ_DIR) -# $(TRICK_CPPC) $(TRICK_CXXFLAGS) -c $< -o $@ +# $(TRICK_CXX) $(TRICK_CXXFLAGS) -c $< -o $@ # #$(TRICK_LIB_DIR)/master.o : $(OBJ_DIR)/master.o | $(TRICK_LIB_DIR) # $(CP) $< $@ @@ -22,7 +22,7 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib #real_clean: clean # #depend: -# @ $(TRICK_CPPC) -MM $(TRICK_CXXFLAGS) master.cpp >> $(DEPTEMPFILE) +# @ $(TRICK_CXX) -MM $(TRICK_CXXFLAGS) master.cpp >> $(DEPTEMPFILE) # @ $(PERL) ${TRICK_HOME}/bin/depend_cp $(DEPTEMPFILE) > $(DEPFILE) # @ $(RM) $(DEPTEMPFILE) # @ echo "Created dependency file $(DEPFILE)" diff --git a/trick_source/trick_swig/Makefile b/trick_source/trick_swig/Makefile index a6a3a47c..6a1b58fb 100644 --- a/trick_source/trick_swig/Makefile +++ b/trick_source/trick_swig/Makefile @@ -70,10 +70,10 @@ swig_${TRICK_HOST_CPU}: mkdir $@ $(SWIG_OBJECT_FILES): $(OBJ_DIR)/%.o : swig_${TRICK_HOST_CPU}/%.cpp - $(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c $< -o $@ + $(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c $< -o $@ $(OBJECT_FILES): $(OBJ_DIR)/%.o : %.cpp - $(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c $< -o $@ + $(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c $< -o $@ $(SWIG_SRC_FILES): swig_${TRICK_HOST_CPU}/%_wrap.cpp : %.i $(SWIG) $(SWIG_DEFS) -I${TRICK_HOME}/trick_source -I${TRICK_HOME}/include -I${TRICK_HOME} -c++ -python -includeall -ignoremissing -w201,362,389,451 -o $@ -outdir ${TRICK_HOME}/share/trick/swig $< diff --git a/trick_source/trick_utils/comm/test/Makefile b/trick_source/trick_utils/comm/test/Makefile index 4b519b35..05dab4ee 100644 --- a/trick_source/trick_utils/comm/test/Makefile +++ b/trick_source/trick_utils/comm/test/Makefile @@ -29,5 +29,5 @@ clean_test : $(RM) -rf $(TESTS) $(TESTS) : $(CPP_OBJS) - $(TRICK_CPPC) $(TRICK_CXXFLAGS) -o $@ $^ $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_CXXFLAGS) -o $@ $^ $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) diff --git a/trick_source/trick_utils/interpolator/test/Makefile b/trick_source/trick_utils/interpolator/test/Makefile index 9a356198..ea834d76 100644 --- a/trick_source/trick_utils/interpolator/test/Makefile +++ b/trick_source/trick_utils/interpolator/test/Makefile @@ -34,8 +34,8 @@ clean : rm -rf io_src xml Interpolator_unittest.o : Interpolator_unittest.cc - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< Interpolator_unittest : Interpolator_unittest.o - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -o $@ $^ $(OTHER_OBJECTS) -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_CPPFLAGS) -o $@ $^ $(OTHER_OBJECTS) -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) diff --git a/trick_source/trick_utils/math/Unittest/makefile b/trick_source/trick_utils/math/Unittest/makefile index a24ce318..a9d19cb6 100644 --- a/trick_source/trick_utils/math/Unittest/makefile +++ b/trick_source/trick_utils/math/Unittest/makefile @@ -26,7 +26,7 @@ INCLUDES = -I${TRICK_HOME}/include top: @ if [ "${TRICK_HOME}" != "" ] ; then \ $(MAKE) -e all \ - "CPP = `${TRICK_HOME}/bin/trick-gte TRICK_CPPC` "; \ + "CPP = `${TRICK_HOME}/bin/trick-gte TRICK_CXX` "; \ else \ $(MAKE) all \ "TRICK_HOST_TYPE = `uname -s` " \ diff --git a/trick_source/trick_utils/math/test/Makefile b/trick_source/trick_utils/math/test/Makefile index 16c3d5f7..dc7afe40 100644 --- a/trick_source/trick_utils/math/test/Makefile +++ b/trick_source/trick_utils/math/test/Makefile @@ -29,8 +29,8 @@ clean : rm -f *.o rm -rf XMLtestReports UnitTestEulerQuat.o : UnitTestEulerQuat.cpp - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< UnitTestEulerQuat : UnitTestEulerQuat.o @echo 'Building UnitTestEulerQuat' - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) diff --git a/trick_source/trick_utils/unicode/test/Makefile b/trick_source/trick_utils/unicode/test/Makefile index 26427629..9a93aa65 100644 --- a/trick_source/trick_utils/unicode/test/Makefile +++ b/trick_source/trick_utils/unicode/test/Makefile @@ -34,8 +34,8 @@ clean : rm -rf io_src xml unicode_utils_test.o : unicode_utils_test.cpp - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< unicode_utils_test : unicode_utils_test.o - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -o $@ $^ $(OTHER_OBJECTS) -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_CPPFLAGS) -o $@ $^ $(OTHER_OBJECTS) -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) diff --git a/trick_source/trick_utils/units/Unittest/makefile b/trick_source/trick_utils/units/Unittest/makefile index 4710cd08..a29f43ea 100644 --- a/trick_source/trick_utils/units/Unittest/makefile +++ b/trick_source/trick_utils/units/Unittest/makefile @@ -31,7 +31,7 @@ top: @ if [ "${TRICK_HOME}" != "" ] ; then \ $(MAKE) -e all \ "CC = `trick-gte TRICK_CC` " \ - "CPP = `trick-gte TRICK_CPPC` "; \ + "CPP = `trick-gte TRICK_CXX` "; \ else \ $(MAKE) all \ "TRICK_HOST_TYPE = `uname -s` " \ diff --git a/trick_source/trick_utils/units/test/makefile b/trick_source/trick_utils/units/test/makefile index 098bb302..d201922e 100644 --- a/trick_source/trick_utils/units/test/makefile +++ b/trick_source/trick_utils/units/test/makefile @@ -33,23 +33,23 @@ clean : rm -rf XMLtestReports UnitTestSuite.o : UnitTestSuite.cpp - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< UnitTestSuite : UnitTestSuite.o @echo 'Building UnitTestSuite' - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) UnitConvTestSuite.o : UnitConvTestSuite.cpp - $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< + $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< UnitConvTestSuite : UnitConvTestSuite.o @echo 'Building UnitConvTestSuite' - $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) + $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) #TestSuite3.o : UnitTestSuite3.cpp -# $(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $< +# $(TRICK_CXX) $(TRICK_CPPFLAGS) -c $< #UnitTestSuite3 : UnitTestSuite3.o # echo "GTEST_HOME = " ${GTEST_HOME} -# $(TRICK_CPPC) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) +# $(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS)