From 97443242c2e69fa2801833ea38857dd03bebf3d8 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Mon, 1 Jun 2015 17:34:52 +0100 Subject: [PATCH] autotools: provide smaller EOLIAN_FLAGS for customization --- src/Makefile.am | 2 ++ src/Makefile_Elua_Helper.am | 2 +- src/Makefile_Eolian_Cxx_Helper.am | 2 +- src/Makefile_Eolian_Helper.am | 8 ++++---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b930b544ae..0522fa33ca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in CLEANFILES = BUILT_SOURCES = +EOLIAN_FLAGS = -I$(srcdir) + DIST_SUBDIRS = SUBDIRS = diff --git a/src/Makefile_Elua_Helper.am b/src/Makefile_Elua_Helper.am index 870a7723d3..10b15541fc 100644 --- a/src/Makefile_Elua_Helper.am +++ b/src/Makefile_Elua_Helper.am @@ -20,6 +20,6 @@ am__v_ELUA_0 = @echo " ELUA " $@; SUFFIXES += .lua %.eo.lua: %.eo ${_ELUA_GEN_DEP} - $(AM_V_ELUA)$(ELUA_GEN) -I$(srcdir) -o $@ $< + $(AM_V_ELUA)$(ELUA_GEN) $(EOLIAN_FLAGS) -o $@ $< CLEANFILES += $(BUILT_SOURCES) diff --git a/src/Makefile_Eolian_Cxx_Helper.am b/src/Makefile_Eolian_Cxx_Helper.am index 64dd131b4b..1b06afdc8a 100644 --- a/src/Makefile_Eolian_Cxx_Helper.am +++ b/src/Makefile_Eolian_Cxx_Helper.am @@ -15,6 +15,6 @@ SUFFIXES += .eo.hh %.eo.impl.hh %.eo.hh: %.eo $(_EOLIAN_CXX_DEP) $(AM_V_EOLCXX) \ $(MKDIR_P) $(dir $@); \ - $(EOLIAN_CXX) -I$(srcdir) -o $@ $< + $(EOLIAN_CXX) $(EOLIAN_FLAGS) -o $@ $< CLEANFILES += $(BUILT_SOURCES) diff --git a/src/Makefile_Eolian_Helper.am b/src/Makefile_Eolian_Helper.am index e533fd9e31..34ea60fc3a 100644 --- a/src/Makefile_Eolian_Helper.am +++ b/src/Makefile_Eolian_Helper.am @@ -15,21 +15,21 @@ SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h .eot .eot.h %.eo.c: %.eo ${_EOLIAN_GEN_DEP} $(AM_V_EOL) \ $(MKDIR_P) $(dir $@); \ - $(EOLIAN_GEN) --eo --legacy -I$(srcdir) --gc -o $@ $< + $(EOLIAN_GEN) --eo --legacy $(EOLIAN_FLAGS) --gc -o $@ $< %.eo.h: %.eo ${_EOLIAN_GEN_DEP} $(AM_V_EOL) \ $(MKDIR_P) $(dir $@); \ - $(EOLIAN_GEN) --eo -I$(srcdir) --gh -o $@ $< + $(EOLIAN_GEN) --eo $(EOLIAN_FLAGS) --gh -o $@ $< %.eot.h: %.eot ${_EOLIAN_GEN_DEP} $(AM_V_EOL) \ $(MKDIR_P) $(dir $@); \ - $(EOLIAN_GEN) --eo -I$(srcdir) --gh -o $@ $< + $(EOLIAN_GEN) --eo $(EOLIAN_FLAGS) --gh -o $@ $< %.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP} $(AM_V_EOL) \ $(MKDIR_P) $(dir $@); \ - $(EOLIAN_GEN) --legacy -I$(srcdir) --gh -o $@ $< + $(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $< CLEANFILES += $(BUILT_SOURCES)