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

Give er7_utils proper Makefiles

Browse Source 
Closes #637
This commit is contained in:
Derek Bankieris 2019-06-21 12:52:03 -05:00
parent 4f1ba26411
commit 422ef225f1
23 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -177,19 +177,9 @@ $(UTILS_DIRS): icg_sim_serv
# 1.1.1.3 Compile the objects in the specified er7_utils directories.
.PHONY: $(ER7_UTILS_DIRS)
$(ER7_UTILS_DIRS): TRICK_CXXFLAGS += -Wno-unused-parameter
$(ER7_UTILS_DIRS): make_er7_makefiles icg_sim_serv
$(ER7_UTILS_DIRS): icg_sim_serv
@ $(MAKE) -C $@ trick
.PHONY: make_er7_makefiles
make_er7_makefiles:
@for i in $(ER7_UTILS_DIRS) ; do \
$(CP) ${TRICK_HOME}/trick_source/sim_services/Executive/Makefile $$i; \
done
ifeq ($(USE_ER7_UTILS), 1)
icg_sim_serv: | make_er7_makefiles
endif
# 1.1.1.4 Generate interface code (using ICG) for the specified sim_services
# header files.
.PHONY: icg_sim_serv
@ -285,10 +275,9 @@ clean_sim_serv:
done
@ $(MAKE) -C ${TRICK_HOME}/trick_source/sim_services/mains real_clean
clean_er7_utils: make_er7_makefiles
clean_er7_utils:
@for i in $(ER7_UTILS_DIRS) ; do \
$(MAKE) -C $$i real_clean ; \
rm $$i/Makefile; \
done
clean_utils:
@ -301,10 +290,6 @@ clean_swig:
$(MAKE) -C $$i real_clean ; \
done
ifeq ($(USE_ER7_UTILS), 1)
clean_swig: make_er7_makefiles
endif
clean_ICG :
$(MAKE) -C ${TRICK_HOME}/trick_source/codegen/Interface_Code_Gen clean

2
test/makefile
View File

@ -8,7 +8,6 @@ COMPILE_DIRS = \
SIM_python_namespace \
SIM_rti \
SIM_stls \
SIM_target_specific_variables \
SIM_test_dp \
SIM_test_dr \
SIM_test_io \
@ -22,6 +21,7 @@ SIMS_NEEDING_TEST = \
SIM_demo_inputfile \
SIM_measurement_units \
SIM_parse_s_define \
SIM_target_specific_variables \
SIM_test_abstract \
SIM_test_inherit \
SIM_test_ip2 \

1
trick_source/er7_utils/.gitignore vendored
View File

@ -1 +0,0 @@
Makefile

3
trick_source/er7_utils/common.mk Normal file
View File

@ -0,0 +1,3 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../share/trick/makefiles/Makefile.common
include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
-include Makefile_deps

1
trick_source/er7_utils/integration/abm4/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/integration/beeman/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/integration/core/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/integration/euler/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/integration/mm4/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/integration/nl2/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/integration/position_verlet/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/integration/rk2_heun/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/integration/rk2_midpoint/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/integration/rk4/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/integration/rkf45/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/integration/rkf78/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/integration/rkg4/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/integration/rkn4/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/integration/symplectic_euler/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/integration/velocity_verlet/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk

1
trick_source/er7_utils/interface/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../common.mk

1
trick_source/er7_utils/math/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../common.mk

1
trick_source/er7_utils/trick/integration/Makefile Normal file
View File

@ -0,0 +1 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../common.mk