From 864ddc05e0265ed8093641ea107736ee3b3fba4b Mon Sep 17 00:00:00 2001 From: Kenji Rikitake Date: Thu, 14 May 2015 13:07:40 +0900 Subject: Build NIF C code also on tests * This patch ensures building the NIF code under`c_src` even on running `make tests` * When `c_src/Makefile` exists: * Split the Makefile invocation dependency into `app-c_src` * Invoke `app-c_src` also in `test-build` as well as `app` * When `c_src/Makefile` does not exist: * Add `$(C_SRC_ENV) $(C_SRC_OUTPUT)` dependencies to `test-build` --- plugins/c_src.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'plugins/c_src.mk') diff --git a/plugins/c_src.mk b/plugins/c_src.mk index 5616923..3ce8e42 100644 --- a/plugins/c_src.mk +++ b/plugins/c_src.mk @@ -48,7 +48,11 @@ link_verbose = $(link_verbose_$(V)) ifeq ($(wildcard $(C_SRC_DIR)),) else ifneq ($(wildcard $(C_SRC_DIR)/Makefile),) -app:: +app:: app-c_src + +test-build:: app-c_src + +app-c_src: $(MAKE) -C $(C_SRC_DIR) \ CFLAGS="$(CFLAGS)" \ CXXFLAGS="$(CXXFLAGS)" \ @@ -67,6 +71,8 @@ COMPILE_CPP = $(cpp_verbose) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c app:: $(C_SRC_ENV) $(C_SRC_OUTPUT) +test-build:: $(C_SRC_ENV) $(C_SRC_OUTPUT) + $(C_SRC_OUTPUT): $(OBJECTS) @mkdir -p priv/ $(link_verbose) $(CC) $(OBJECTS) $(LDFLAGS) $(LDLIBS) -o $(C_SRC_OUTPUT) -- cgit v1.2.3