From 3b41e02ea518263509180b0c9c2b3f0e5d542f87 Mon Sep 17 00:00:00 2001
From: Alexander Senier <senier@componolit.com>
Date: Sun, 3 Feb 2019 23:57:27 +0100
Subject: [PATCH] Create make dependencies using ali2dep

---
 repos/base/mk/generic.mk | 6 ++++--
 repos/base/mk/global.mk  | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/repos/base/mk/generic.mk b/repos/base/mk/generic.mk
index 5f65f35df4..c11b9dbf58 100644
--- a/repos/base/mk/generic.mk
+++ b/repos/base/mk/generic.mk
@@ -84,11 +84,13 @@ CUSTOM_ADA_INCLUDE ?= -I- $(INCLUDES)
 
 %.ali %.o: %.adb
 	$(MSG_COMP)$@
-	$(VERBOSE)$(CC) -c $(CUSTOM_ADA_FLAGS) $< $(CUSTOM_ADA_OPT) $(CUSTOM_ADA_INCLUDE)
+	$(VERBOSE)$(CC) $(CUSTOM_ADA_FLAGS) $(CUSTOM_ADA_OPT) $(CUSTOM_ADA_INCLUDE) -c $<
+	$(VERBOSE)$(ALI2DEP) $(ALL_INC_DIR) $*.ali
 
 %.ali %.o: %.ads
 	$(MSG_COMP)$@
-	$(VERBOSE)$(CC) -c $(CUSTOM_ADA_FLAGS) $< $(CUSTOM_ADA_OPT) $(CUSTOM_ADA_INCLUDE)
+	$(VERBOSE)$(CC) $(CUSTOM_ADA_FLAGS) $(CUSTOM_ADA_OPT) $(CUSTOM_ADA_INCLUDE) -c $<
+	$(VERBOSE)$(ALI2DEP) $(ALL_INC_DIR) $*.ali
 
 #
 # Compiling Rust sources
diff --git a/repos/base/mk/global.mk b/repos/base/mk/global.mk
index 84fdc8f554..1f95d8aa1d 100644
--- a/repos/base/mk/global.mk
+++ b/repos/base/mk/global.mk
@@ -25,6 +25,7 @@ CUSTOM_STRIP    ?= $(CROSS_DEV_PREFIX)strip
 CUSTOM_GNATBIND ?= $(CROSS_DEV_PREFIX)gnatbind
 CUSTOM_HOST_CC  ?= gcc
 CUSTOM_ADA_CC   ?= $(CUSTOM_CC)
+CUSTOM_ALI2DEP  ?= echo "        WARNING: ali2dep not used, get it from https://github.com/Componolit/ali2dep and make CUSTUM_ALI2DEP point to the binary." \#
 
 #
 # GNU utilities
@@ -53,6 +54,7 @@ STRIP    = $(CUSTOM_STRIP)
 GNATBIND = $(CUSTOM_GNATBIND)
 HOST_CC  = $(CUSTOM_HOST_CC)
 ADA_CC   = $(CUSTOM_ADA_CC)
+ALI2DEP  = $(CUSTOM_ALI2DEP)
 
 #
 # Compiler and Linker options