From 418969e804841f3f9724935dc9affc80c58d0f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Tue, 12 May 2015 22:45:26 +0300 Subject: More improvements for building dependencies --- plugins/c_src.mk | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'plugins') diff --git a/plugins/c_src.mk b/plugins/c_src.mk index e23c7b9..5616923 100644 --- a/plugins/c_src.mk +++ b/plugins/c_src.mk @@ -2,7 +2,6 @@ # This file is part of erlang.mk and subject to the terms of the ISC License. .PHONY: clean-c_src distclean-c_src-env -# todo # Configuration. @@ -50,7 +49,11 @@ link_verbose = $(link_verbose_$(V)) ifeq ($(wildcard $(C_SRC_DIR)),) else ifneq ($(wildcard $(C_SRC_DIR)/Makefile),) app:: - $(MAKE) -C $(C_SRC_DIR) + $(MAKE) -C $(C_SRC_DIR) \ + CFLAGS="$(CFLAGS)" \ + CXXFLAGS="$(CXXFLAGS)" \ + LDLIBS="$(LDLIBS)" \ + LDFLAGS="$(LDFLAGS)" clean:: $(MAKE) -C $(C_SRC_DIR) clean @@ -80,6 +83,14 @@ $(C_SRC_OUTPUT): $(OBJECTS) %.o: %.cpp $(COMPILE_CPP) $(OUTPUT_OPTION) $< +clean:: clean-c_src + +clean-c_src: + $(gen_verbose) rm -f $(C_SRC_OUTPUT) $(OBJECTS) + +endif + +ifneq ($(wildcard $(C_SRC_DIR)),) $(C_SRC_ENV): @$(ERL) -eval "file:write_file(\"$(C_SRC_ENV)\", \ io_lib:format( \ @@ -91,11 +102,6 @@ $(C_SRC_ENV): code:lib_dir(erl_interface, lib)])), \ halt()." -clean:: clean-c_src - -clean-c_src: - $(gen_verbose) rm -f $(C_SRC_OUTPUT) $(OBJECTS) - distclean:: distclean-c_src-env distclean-c_src-env: -- cgit v1.2.3