summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2016-10-05 17:41:31 +0200
committerNico Huber <nico.h@gmx.de>2016-10-29 01:34:06 +0200
commitd011b6b8325680f3cccca87a685663f5f3b8be88 (patch)
tree67cd59371fd6e64d2e93460b43cc8b58ad156fe7
parente941eef823687b3333185204aebb81a23e7c5b29 (diff)
Makefile: Allow inclusion of source files from 3rdparty/
Change-Id: I81c6f628f239223ba293a1196f70e4f26e022f6c Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/16950 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth@google.com>
-rw-r--r--Makefile6
1 files 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