ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-18 20:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make TRICK_CXX variable to specify c++ compiler #767 (#815)

Browse Source 
Changed all references of TRICK_CPPC to TRICK_CXX.  Added a
warning message that TRICK_CPPC has been deprecated.
This commit is contained in:
Alex Lin 2019-06-18 11:00:08 -05:00 committed by GitHub
parent 187fa37540
commit 497f11f132
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 113 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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

2
bin/trick-CP
View File

@ -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:

6
libexec/trick/make_makefile_src
View File

@ -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\$(<D)/../include -MMD -MP -c -o \$\@ \$<" ;
print MAKEFILE "
@ -323,7 +323,7 @@ all: S_sie.resource
\$(S_MAIN): S_source.hh \$(TRICK_STATIC_LIB) \$(S_OBJECTS) \$(MODEL_OBJECTS)
\t\$(PRINT_EXE_LINK)
\t\$(call ECHO_AND_LOG,\$(TRICK_CPPC) -o \$@ \$(TRICK_SYSTEM_LDFLAGS) \$(S_OBJECTS) \$(LINK_LISTS) \$(TRICK_LDFLAGS) \$(TRICK_USER_LINK_LIBS) \$(READ_ONLY_LIBS) \$(LD_WHOLE_ARCHIVE) \$(TRICK_LIBS) \$(LD_NO_WHOLE_ARCHIVE) \$(TRICK_EXEC_LINK_LIBS))
\t\$(call ECHO_AND_LOG,\$(TRICK_CXX) -o \$@ \$(TRICK_SYSTEM_LDFLAGS) \$(S_OBJECTS) \$(LINK_LISTS) \$(TRICK_LDFLAGS) \$(TRICK_USER_LINK_LIBS) \$(READ_ONLY_LIBS) \$(LD_WHOLE_ARCHIVE) \$(TRICK_LIBS) \$(LD_NO_WHOLE_ARCHIVE) \$(TRICK_EXEC_LINK_LIBS))
# SIE ==========================================================================

2
libexec/trick/make_makefile_swig
View File

@ -209,7 +209,7 @@ SWIG_OBJECTS = \$(subst .cpp,.o,\$(SWIG_SRC)) $swig_src_dir/init_swig_modules.o
\$(SWIG_OBJECTS): %.o: %.cpp
\t\$(PRINT_COMPILE_SWIG)
\t\$(call ECHO_AND_LOG,\$(TRICK_CPPC) \$(TRICK_CXXFLAGS) \$(TRICK_SYSTEM_CXXFLAGS) \$(TRICK_SWIG_CFLAGS) \$(TRICK_SYSTEM_SWIG_CFLAGS) -Wno-unused-parameter -c -o \$@ \$<)
\t\$(call ECHO_AND_LOG,\$(TRICK_CXX) \$(TRICK_CXXFLAGS) \$(TRICK_SYSTEM_CXXFLAGS) \$(TRICK_SWIG_CFLAGS) \$(TRICK_SYSTEM_SWIG_CFLAGS) -Wno-unused-parameter -c -o \$@ \$<)
\$(S_MAIN): \$(SWIG_OBJECTS)

2
libexec/trick/pm/gte.pm
View File

@ -82,7 +82,7 @@ sub gte (@) {
$def{"TRICK_CFLAGS"} = "" ;
$def{"TRICK_CXXFLAGS"} = "" ;
$def{"TRICK_CPFLAGS"} = "" ;
$def{"TRICK_CPPC"} = "c++" ;
$def{"TRICK_CXX"} = "c++" ;
$def{"TRICK_DEBUG"} = "0" ;
$def{"TRICK_EDITOR"} = "" ;
$def{"TRICK_EXEC_LINK_LIBS"} = "" ;

12
share/trick/makefiles/Makefile.common
View File

@ -36,8 +36,14 @@ ifndef TRICK_CC
export TRICK_CC := $(CC)
endif
ifndef TRICK_CPPC
export TRICK_CPPC := $(CXX)
# TODO: Remove support for TRICK_CPPC in 2021
ifdef TRICK_CPPC
$(warning TRICK_CPPC is deprecated, use TRICK_CXX instead)
export TRICK_CXX := $(TRICK_CPPC)
endif
ifndef TRICK_CXX
export TRICK_CXX := $(CXX)
endif
ifndef TRICK_LD
@ -112,7 +118,7 @@ ifeq ($(TRICK_FORCE_32BIT), 1)
LD_PARTIAL += -melf_i386
endif
IS_CC_CLANG = $(shell ${TRICK_CPPC} -xc /dev/null -dM -E | grep -c __clang__)
IS_CC_CLANG = $(shell ${TRICK_CXX} -xc /dev/null -dM -E | grep -c __clang__)
ifeq ($(IS_CC_CLANG), 1)
TRICK_SYSTEM_CXXFLAGS += -fcolor-diagnostics
else

18
share/trick/makefiles/Makefile.tricklib
View File

@ -107,7 +107,7 @@ ifeq ($(IS_CC_CLANG), 0)
endif
$(IO_CPP_OBJS): $(OBJ_DIR)/%.o : $(IO_SRC_DIR)%.cpp | $(OBJ_DIR)
$(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c $< -o $@
$(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c $< -o $@
#
#
@ -122,19 +122,19 @@ $(C_OBJS): $(OBJ_DIR)/%.o : $(SRC_DIR)%.c | $(OBJ_DIR)
#
$(CPP_C_OBJS): $(OBJ_DIR)/%.o : $(SRC_DIR)%.C | $(OBJ_DIR)
$(CD_CMD) $(TRICK_CPPC) $(TRICK_CFLAGS) $(TRICK_SYSTEM_CFLAGS) -c ${<F} -o $(UP_DIR)$@
$(CD_CMD) $(TRICK_CXX) $(TRICK_CFLAGS) $(TRICK_SYSTEM_CFLAGS) -c ${<F} -o $(UP_DIR)$@
$(CPP_CC_OBJS): $(OBJ_DIR)/%.o : $(SRC_DIR)%.cc | $(OBJ_DIR)
$(CD_CMD) $(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c ${<F} -o $(UP_DIR)$@
$(CD_CMD) $(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c ${<F} -o $(UP_DIR)$@
$(CPP_CPP_OBJS): $(OBJ_DIR)/%.o : $(SRC_DIR)%.cpp | $(OBJ_DIR)
$(CD_CMD) $(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c ${<F} -o $(UP_DIR)$@
$(CD_CMD) $(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c ${<F} -o $(UP_DIR)$@
$(CPP_CXX_OBJS): $(OBJ_DIR)/%.o : $(SRC_DIR)%.cxx | $(OBJ_DIR)
$(CD_CMD) $(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c ${<F} -o $(UP_DIR)$@
$(CD_CMD) $(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c ${<F} -o $(UP_DIR)$@
$(CPP_CPLUS_OBJS): $(OBJ_DIR)/%.o : $(SRC_DIR)%.c++ | $(OBJ_DIR)
$(CD_CMD) $(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c ${<F} -o $(UP_DIR)$@
$(CD_CMD) $(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c ${<F} -o $(UP_DIR)$@
#
# LEX/YACC SOURCE
@ -155,10 +155,10 @@ $(Y_C_PREMADE) : $(SRC_DIR)%.tab.c_premade : $(SRC_DIR)%.y
$(YACC) -d -o $@ $<
$(L_OBJS) : $(OBJ_DIR)/%.lex.o : $(SRC_DIR)%.lex.c $(SRC_DIR)%.tab.h | $(OBJ_DIR)
$(CD_CMD) $(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c ${<F} -o $(UP_DIR)$@
$(CD_CMD) $(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c ${<F} -o $(UP_DIR)$@
$(Y_OBJS) : $(OBJ_DIR)/%.tab.o : $(SRC_DIR)%.tab.c | $(OBJ_DIR)
$(CD_CMD) $(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c ${<F} -o $(UP_DIR)$@
$(CD_CMD) $(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c ${<F} -o $(UP_DIR)$@
#
@ -166,7 +166,7 @@ $(Y_OBJS) : $(OBJ_DIR)/%.tab.o : $(SRC_DIR)%.tab.c | $(OBJ_DIR)
#
depend:
@ $(TRICK_CPPC) -MM $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) $(C_SRC) $(CPP_SRC) >> $(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)"

6
share/trick/makefiles/trickify.mk
View File

@ -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) $<)

4
trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp
View File

@ -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 ;

2
trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.hh
View File

@ -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 */

2
trick_source/codegen/Interface_Code_Gen/PrintAttributes.cpp
View File

@ -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

14
trick_source/sim_services/Clock/test/Makefile
View File

@ -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 $<

4
trick_source/sim_services/Executive/test/Makefile
View File

@ -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)

4
trick_source/sim_services/Integrator/test/Makefile
View File

@ -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)

4
trick_source/sim_services/JITInputFile/JITInputFile.cpp
View File

@ -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

82
trick_source/sim_services/MemoryManager/test/Makefile
View File

@ -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)

8
trick_source/sim_services/MonteCarlo/test/Makefile
View File

@ -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)

4
trick_source/sim_services/ScheduledJobQueue/test/Makefile
View File

@ -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)

4
trick_source/sim_services/Timer/test/Makefile
View File

@ -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)

4
trick_source/sim_services/mains/Makefile
View File

@ -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)"

4
trick_source/trick_swig/Makefile
View File

@ -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 $<

2
trick_source/trick_utils/comm/test/Makefile
View File

@ -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)

4
trick_source/trick_utils/interpolator/test/Makefile
View File

@ -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)

2
trick_source/trick_utils/math/Unittest/makefile
View File

@ -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` " \

4
trick_source/trick_utils/math/test/Makefile
View File

@ -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)

4
trick_source/trick_utils/unicode/test/Makefile
View File

@ -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)

2
trick_source/trick_utils/units/Unittest/makefile
View File

@ -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` " \

12
trick_source/trick_utils/units/test/makefile
View File

@ -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)