From d28b000e1d33222a4ef0de387a6e359a52cb8249 Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Wed, 22 Feb 2012 11:55:57 +0100
Subject: Make hipe hipe-compiled w/ --enable-native-libs

---
 lib/hipe/Makefile | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'lib/hipe/Makefile')

diff --git a/lib/hipe/Makefile b/lib/hipe/Makefile
index 6682c9aac0..f2be75f0dd 100644
--- a/lib/hipe/Makefile
+++ b/lib/hipe/Makefile
@@ -37,8 +37,13 @@ else
 SUB_DIRECTORIES = $(ALWAYS_SUBDIRS)
 endif
 
+
 include native.mk
 
+ifndef EBIN
+EBIN = ../ebin
+endif
+
 #
 # Default Subdir Targets
 #
@@ -52,12 +57,20 @@ edocs:
 	fi
 
 all-subdirs:
-	-for dir in $(SUB_DIRECTORIES); do \
-		(cd $$dir; $(MAKE) $(MAKETARGET) EBIN=../ebin; cd ..); \
+	for dir in $(SUB_DIRECTORIES); do \
+		(cd $$dir; $(MAKE) $(MAKETARGET) EBIN=$(EBIN); cd ..); \
+	done
+
+# distclean and realclean should clean the bootstrap files
+all-subdirs-x:
+	for dir in $(SUB_DIRECTORIES); do \
+		(cd $$dir; $(MAKE) $(MAKETARGET) EBIN=../boot_ebin; cd ..); \
 	done
 
+clean:
+	$(MAKE) MAKETARGET="clean" all-subdirs all-subdirs-x
 distclean:
-	$(MAKE) MAKETARGET="distclean" all-subdirs
+	$(MAKE) MAKETARGET="distclean" all-subdirs all-subdirs-x
 realclean:
-	$(MAKE) MAKETARGET="realclean" all-subdirs
+	$(MAKE) MAKETARGET="realclean" all-subdirs all-subdirs-x
 
-- 
cgit v1.2.3