Skip to content
Snippets Groups Projects
Commit f12f19e6 authored by Virgile Prevosto's avatar Virgile Prevosto Committed by Andre Maroneze
Browse files

[Makefile] Use appropriate -I directive for compiling test scripts

parent 1eb46835
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
share/Makefile.plugin.template
+ 13
− 7
View file @ f12f19e6
...@@ -399,6 +399,8 @@ endif ...@@ -399,6 +399,8 @@ endif
# Some meta-variables for compilation flags # Some meta-variables for compilation flags
NAME_BFLAGS :=@PLUGIN_NAME@_BFLAGS NAME_BFLAGS :=@PLUGIN_NAME@_BFLAGS
NAME_OFLAGS :=@PLUGIN_NAME@_OFLAGS NAME_OFLAGS :=@PLUGIN_NAME@_OFLAGS
NAME_TEST_BFLAGS :=@PLUGIN_NAME@_TEST_BFLAGS
NAME_TEST_OFLAGS :=@PLUGIN_NAME@_TEST_OFLAGS
TARGET_OFLAGS :=@PLUGIN_NAME@_TARGET_OFLAGS TARGET_OFLAGS :=@PLUGIN_NAME@_TARGET_OFLAGS
TARGET_BFLAGS :=@PLUGIN_NAME@_TARGET_BFLAGS TARGET_BFLAGS :=@PLUGIN_NAME@_TARGET_BFLAGS
ifeq ($(HAS_GUI),yes) ifeq ($(HAS_GUI),yes)
...@@ -434,12 +436,16 @@ endif ...@@ -434,12 +436,16 @@ endif
PLUGIN_EXTRA_DIRS_INC:=$(patsubst %,-I $(PLUGIN_DIR)/% ,$(PLUGIN_EXTRA_DIRS)) PLUGIN_EXTRA_DIRS_INC:=$(patsubst %,-I $(PLUGIN_DIR)/% ,$(PLUGIN_EXTRA_DIRS))
# Set the compilation flags for the plugin # Set the compilation flags for the plugin
INCLUDE_FLAGS:=-I $(PLUGIN_DIR) -I $(INSTALLED_PLUGIN_DIR) \ INCLUDE_EXT_FLAGS:=-I $(INSTALLED_PLUGIN_DIR) \
$(PLUGIN_EXTRA_DIRS_INC) \ $(addprefix -package ,$(PLUGIN_PACKAGES) $(LIBRARY_NAMES))
$(addprefix -package ,$(PLUGIN_PACKAGES) $(LIBRARY_NAMES)) INCLUDE_FLAGS:=-I $(PLUGIN_DIR) $(PLUGIN_EXTRA_DIRS_INC) $(INCLUDE_EXT_FLAGS)
$(NAME_BFLAGS):=$(BFLAGS) $(INCLUDE_FLAGS) $(PLUGIN_BFLAGS) $(NAME_BFLAGS):=$(BFLAGS) $(INCLUDE_FLAGS) $(PLUGIN_BFLAGS)
$(NAME_OFLAGS):=$(OFLAGS) $(INCLUDE_FLAGS) $(PLUGIN_OFLAGS) $(NAME_OFLAGS):=$(OFLAGS) $(INCLUDE_FLAGS) $(PLUGIN_OFLAGS)
# DO NOT include the plugin's own directory as search path for compiling
# ml test scripts: they will be loaded in a separate phase, and will only see
# the plugin through its static API
$(NAME_TEST_BFLAGS):= $(BFLAGS) $(INCLUDE_EXT_FLAGS) $(PLUGIN_BFLAGS)
$(NAME_TEST_OFLAGS):= $(OFLAGS) $(INCLUDE_EXT_FLAGS) $(PLUGIN_OFLAGS)
$(TARGET_BFLAGS):= $(PLUGIN_LINK_BFLAGS) $(TARGET_BFLAGS):= $(PLUGIN_LINK_BFLAGS)
$(TARGET_OFLAGS):= $(PLUGIN_LINK_OFLAGS) $(TARGET_OFLAGS):= $(PLUGIN_LINK_OFLAGS)
...@@ -863,9 +869,9 @@ endif ...@@ -863,9 +869,9 @@ endif
@PLUGIN_NAME@_TESTS_LIB_OPT_DYN:=$(PLUGIN_TESTS_LIB:%.ml=%.cmxs) @PLUGIN_NAME@_TESTS_LIB_OPT_DYN:=$(PLUGIN_TESTS_LIB:%.ml=%.cmxs)
@PLUGIN_NAME@_TESTS_LIB_BYTE:=$(PLUGIN_TESTS_LIB:%.ml=%.cmo) @PLUGIN_NAME@_TESTS_LIB_BYTE:=$(PLUGIN_TESTS_LIB:%.ml=%.cmo)
$(@PLUGIN_NAME@_TESTS_LIB_OPT): OFLAGS:=$($(NAME_OFLAGS)) $(@PLUGIN_NAME@_TESTS_LIB_DIR_INCLUDE) $(@PLUGIN_NAME@_TESTS_LIB_OPT): OFLAGS:=$($(NAME_TEST_OFLAGS)) $(@PLUGIN_NAME@_TESTS_LIB_DIR_INCLUDE)
$(@PLUGIN_NAME@_TESTS_LIB_OPT_DYN): OFLAGS:=$($(NAME_OFLAGS)) $(@PLUGIN_NAME@_TESTS_LIB_DIR_INCLUDE) $(@PLUGIN_NAME@_TESTS_LIB_OPT_DYN): OFLAGS:=$($(NAME_TEST_OFLAGS)) $(@PLUGIN_NAME@_TESTS_LIB_DIR_INCLUDE)
$(@PLUGIN_NAME@_TESTS_LIB_BYTE): BFLAGS:=$($(NAME_BFLAGS)) $(@PLUGIN_NAME@_TESTS_LIB_DIR_INCLUDE) $(@PLUGIN_NAME@_TESTS_LIB_BYTE): BFLAGS:=$($(NAME_TEST_BFLAGS)) $(@PLUGIN_NAME@_TESTS_LIB_DIR_INCLUDE)
# [JS 2009/03/18] both .PRECIOUS are required in order to prevent 'make' # [JS 2009/03/18] both .PRECIOUS are required in order to prevent 'make'
# deletion of intermediate generated files. Such a deletion forces 'make' to # deletion of intermediate generated files. Such a deletion forces 'make' to
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment