From a8b37f6345b60c9955581f7427f04b68a43142b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Tue, 24 Apr 2012 16:46:34 +0200
Subject: ssl: Fix parallel make for behaviours

---
 lib/ssl/src/Makefile | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
index dc69b53b28..f99dd8559e 100644
--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
@@ -37,6 +37,9 @@ RELSYSDIR = $(RELEASE_PATH)/lib/ssl-$(VSN)
 # Common Macros
 # ----------------------------------------------------
 
+BEHAVIOUR_MODULES= \
+        ssl_session_cache_api
+
 MODULES= \
 	ssl \
 	ssl_alert \
@@ -53,7 +56,6 @@ MODULES= \
 	ssl_handshake \
 	ssl_manager \
 	ssl_session \
-        ssl_session_cache_api \
 	ssl_session_cache \
 	ssl_record \
 	ssl_ssl2 \
@@ -66,10 +68,15 @@ INTERNAL_HRL_FILES = \
 	 ssl_alert.hrl ssl_cipher.hrl ssl_handshake.hrl ssl_internal.hrl \
 	 ssl_record.hrl
 
-ERL_FILES= $(MODULES:%=%.erl)
+ERL_FILES= \
+	$(MODULES:%=%.erl) \
+	$(BEHAVIOUR_MODULES:%=%.erl)
+
 
 TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
+BEHAVIOUR_TARGET_FILES= $(BEHAVIOUR_MODULES:%=$(EBIN)/%.$(EMULATOR))
+
 APP_FILE= ssl.app
 APPUP_FILE= ssl.appup
 
@@ -83,6 +90,7 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 # ----------------------------------------------------
 EXTRA_ERLC_FLAGS = +warn_unused_vars
 ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \
+	-pz $(EBIN) \
 	-pz $(ERL_TOP)/lib/public_key/ebin \
 	$(EXTRA_ERLC_FLAGS) -DVSN=\"$(VSN)\"
 
@@ -91,6 +99,8 @@ ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \
 # Targets
 # ----------------------------------------------------
 
+$(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
+
 debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) 
 
 clean:
@@ -105,6 +115,7 @@ $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
 
 docs:
 
+
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
@@ -114,14 +125,8 @@ release_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)/src
 	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
+	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
 	$(APPUP_TARGET) $(RELSYSDIR)/ebin
 
 release_docs_spec:
 
-
-
-
-
-
-
-- 
cgit v1.2.3