From f4d2c5cd50bd6f32fb85ba7e7790a6cbf2e05cb5 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Wed, 5 Oct 2016 17:41:31 +0200 Subject: [PATCH] UPSTREAM: Makefile: Allow inclusion of source files from 3rdparty/ BUG=None BRANCH=None TEST=None Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/16950 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Change-Id: I81c6f628f239223ba293a1196f70e4f26e022f6c Reviewed-on: https://chromium-review.googlesource.com/406944 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4401288760..7801c47160 100644 --- a/Makefile +++ b/Makefile @@ -190,12 +190,13 @@ add-special-class= \ src-to-obj=\ $(patsubst $(obj)/%,$(obj)/$(1)/%,\ $(patsubst $(obj)/$(1)/%,$(obj)/%,\ + $(patsubst 3rdparty/%,$(obj)/%,\ $(patsubst src/%,$(obj)/%,\ $(patsubst %.ads,%.o,\ $(patsubst %.adb,%.o,\ $(patsubst %.c,%.o,\ $(patsubst %.S,%.o,\ - $(subst .$(1),,$(2))))))))) + $(subst .$(1),,$(2)))))))))) # Converts one or more source file paths to the corresponding build/ paths # of their Ada library information (.ali) files. @@ -204,11 +205,12 @@ src-to-obj=\ src-to-ali=\ $(patsubst $(obj)/%,$(obj)/$(1)/%,\ $(patsubst $(obj)/$(1)/%,$(obj)/%,\ + $(patsubst 3rdparty/%,$(obj)/%,\ $(patsubst src/%,$(obj)/%,\ $(patsubst %.ads,%.ali,\ $(patsubst %.adb,%.ali,\ $(subst .$(1),,\ - $(filter %.ads %.adb,$(2)))))))) + $(filter %.ads %.adb,$(2))))))))) # Clean -y variables, include Makefile.inc # Add paths to files in X-y to X-srcs