From a963e58cd0b0e3fe5026906cfb3649e8a3d5ef23 Mon Sep 17 00:00:00 2001
From: Andreas Stenius <andreas.stenius@svenskaspel.se>
Date: Thu, 26 Mar 2015 14:33:47 +0100
Subject: Require makefile to build dep. Fixes #218.

---
 core/deps.mk | 3 ++-
 erlang.mk    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/deps.mk b/core/deps.mk
index 74bc30b..879cf43 100644
--- a/core/deps.mk
+++ b/core/deps.mk
@@ -37,7 +37,8 @@ deps:: $(ALL_DEPS_DIRS)
 		if [ -f $$dep/GNUmakefile ] || [ -f $$dep/makefile ] || [ -f $$dep/Makefile ] ; then \
 			$(MAKE) -C $$dep ; \
 		else \
-			echo "include $(CURDIR)/erlang.mk" | ERLC_OPTS=+debug_info $(MAKE) -f - -C $$dep ; \
+			echo "ERROR: No makefile to build dependency $$dep. Consider adding it to AUTOPATCH." ; \
+			exit 1 ; \
 		fi ; \
 	done
 
diff --git a/erlang.mk b/erlang.mk
index e6833bc..c68ef25 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -142,7 +142,8 @@ deps:: $(ALL_DEPS_DIRS)
 		if [ -f $$dep/GNUmakefile ] || [ -f $$dep/makefile ] || [ -f $$dep/Makefile ] ; then \
 			$(MAKE) -C $$dep ; \
 		else \
-			echo "include $(CURDIR)/erlang.mk" | ERLC_OPTS=+debug_info $(MAKE) -f - -C $$dep ; \
+			echo "ERROR: No makefile to build dependency $$dep. Consider adding it to AUTOPATCH." ; \
+			exit 1 ; \
 		fi ; \
 	done
 
-- 
cgit v1.2.3


From 530ae30fcda6d434d3d013b8cb4cdefedd1385a9 Mon Sep 17 00:00:00 2001
From: Andreas Stenius <andreas.stenius@svenskaspel.se>
Date: Fri, 17 Apr 2015 11:58:10 +0200
Subject: propagate failed deps builds.

Unless we return a non-zero result from the deps target, any issues in
the build of a dependency will be masked.
---
 core/deps.mk | 2 +-
 erlang.mk    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/deps.mk b/core/deps.mk
index 879cf43..b0fb2dc 100644
--- a/core/deps.mk
+++ b/core/deps.mk
@@ -35,7 +35,7 @@ PKG_FILE_URL ?= https://raw.githubusercontent.com/ninenines/erlang.mk/master/pac
 deps:: $(ALL_DEPS_DIRS)
 	@for dep in $(ALL_DEPS_DIRS) ; do \
 		if [ -f $$dep/GNUmakefile ] || [ -f $$dep/makefile ] || [ -f $$dep/Makefile ] ; then \
-			$(MAKE) -C $$dep ; \
+			$(MAKE) -C $$dep || exit $$? ; \
 		else \
 			echo "ERROR: No makefile to build dependency $$dep. Consider adding it to AUTOPATCH." ; \
 			exit 1 ; \
diff --git a/erlang.mk b/erlang.mk
index c68ef25..3f00e6a 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -140,7 +140,7 @@ PKG_FILE_URL ?= https://raw.githubusercontent.com/ninenines/erlang.mk/master/pac
 deps:: $(ALL_DEPS_DIRS)
 	@for dep in $(ALL_DEPS_DIRS) ; do \
 		if [ -f $$dep/GNUmakefile ] || [ -f $$dep/makefile ] || [ -f $$dep/Makefile ] ; then \
-			$(MAKE) -C $$dep ; \
+			$(MAKE) -C $$dep || exit $$? ; \
 		else \
 			echo "ERROR: No makefile to build dependency $$dep. Consider adding it to AUTOPATCH." ; \
 			exit 1 ; \
-- 
cgit v1.2.3