SWIG all of S_library_swig during Trickification

Fixes #681
This commit is contained in:
Derek Bankieris 2018-10-18 08:05:53 -05:00 committed by dbankieris
parent 6ef62f6502
commit d38c30ad02

View File

@ -70,7 +70,6 @@
#
# For more information, see:
# github.com/nasa/trick/wiki/Trickified-Project-Libraries
ifndef TRICKIFY_CXX_FLAGS
$(error TRICKIFY_CXX_FLAGS must be set)
endif
@ -80,7 +79,7 @@ TRICKIFY_PYTHON_DIR ?= python
TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/../../..)
ifneq ($(wildcard build),)
SWIG_OBJECTS := $(shell tail -n +2 build/S_library_swig)
SWIG_OBJECTS := $(shell cat build/S_library_swig)
SWIG_OBJECTS := $(addprefix build,$(addsuffix _py.o,$(basename $(SWIG_OBJECTS))))
IO_OBJECTS := $(shell find build -name "io_*.cpp")
IO_OBJECTS := $(IO_OBJECTS:.cpp=.o)
@ -132,6 +131,7 @@ $(SWIG_OBJECTS:.o=.cpp): %.cpp: %.i | $(TRICKIFY_PYTHON_DIR) $(SWIG_OBJECTS:.o=.
define create_convert_swig_rule
build/%_py.i: /%.$1
$$(info $$(call COLOR,Converting) $$<)
${TRICK_HOME}/$(LIBEXEC)/trick/convert_swig ${TRICK_CONVERT_SWIG_FLAGS} $$<
endef