From df21b2d48cb58d136852240fac4df82e4c6119bf Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Thu, 24 Jul 2008 11:53:00 +0000
Subject: [PATCH] * src/Makefile.in: Support for parallel compilation with
 'make -j' in multi core CPUs: fix compilation dependencies; compile behaviors
 before other source code (EJAB-697)(thanks to Jonathan Schleifer) *
 src/mod_pubsub/Makefile.in: Likewise * src/eldap/Makefile.in: Likewise

SVN Revision: 1484
---
 ChangeLog                  |  7 +++++++
 src/Makefile.in            | 10 ++++++++--
 src/eldap/Makefile.in      |  2 ++
 src/mod_pubsub/Makefile.in |  9 +++++++--
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 73f4b3c57..25bb1fa58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-07-24  Badlop  <badlop@process-one.net>
 
+	* src/Makefile.in: Support for parallel compilation with 'make -j'
+	in multi core CPUs: fix compilation dependencies; compile
+	behaviors before other source code (EJAB-697)(thanks to Jonathan
+	Schleifer)
+	* src/mod_pubsub/Makefile.in: Likewise
+	* src/eldap/Makefile.in: Likewise
+
 	* doc/guide.tex: Document room options allow_visitor_nickchange
 	and allow_visitor_status (EJAB-624)
 	* doc/guide.html: Likewise
diff --git a/src/Makefile.in b/src/Makefile.in
index a7215ba76..5e03491e1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -51,7 +51,9 @@ exec_prefix = @exec_prefix@
 SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @mod_proxy65@ @eldap@ @pam@ @web@ stringprep @tls@ @odbc@ @ejabberd_zlib@
 ERLSHLIBS = expat_erl.so
 ERLBEHAVS = cyrsasl.erl gen_mod.erl p1_fsm.erl
-SOURCES = $(ERLBEHAVS) $(wildcard *.erl)
+SOURCES_ALL = $(wildcard *.erl)
+SOURCES = $(filter-out $(ERLBEHAVS),$(SOURCES_ALL))
+ERLBEHAVBEAMS = $(ERLBEHAVS:.erl=.beam)
 BEAMS = $(SOURCES:.erl=.beam)
 
 DESTDIR =
@@ -76,7 +78,11 @@ endif
 
 all: $(ERLSHLIBS) compile-beam all-recursive
 
-compile-beam: XmppAddr.hrl $(BEAMS)
+compile-beam: XmppAddr.hrl $(ERLBEHAVBEAMS) $(BEAMS)
+
+$(BEAMS): $(ERLBEHAVBEAMS)
+
+all-recursive: $(ERLBEHAVBEAMS)
 
 %.beam:       %.erl
 	@ERLC@ -W $(ERLC_FLAGS) $<
diff --git a/src/eldap/Makefile.in b/src/eldap/Makefile.in
index 4e1e87688..1c9b7ca22 100644
--- a/src/eldap/Makefile.in
+++ b/src/eldap/Makefile.in
@@ -22,6 +22,8 @@ BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
 
 all:    $(BEAMS) ELDAPv3.beam
 
+ELDAPv3.beam: ELDAPv3.erl
+
 ELDAPv3.erl:       ELDAPv3.asn
 	@ERLC@ -bber_bin -W $(EFLAGS) $<
 
diff --git a/src/mod_pubsub/Makefile.in b/src/mod_pubsub/Makefile.in
index b9eba4267..39f6a16e8 100644
--- a/src/mod_pubsub/Makefile.in
+++ b/src/mod_pubsub/Makefile.in
@@ -16,11 +16,16 @@ ifdef debug
 endif
 
 OUTDIR = ..
-SOURCES = $(wildcard *.erl)
+ERLBEHAVS = gen_pubsub_node.erl gen_pubsub_nodetree.erl
+SOURCES_ALL = $(wildcard *.erl)
+SOURCES = $(filter-out $(ERLBEHAVS),$(SOURCES_ALL))
+ERLBEHAVBEAMS = $(addprefix $(OUTDIR)/,$(ERLBEHAVS:.erl=.beam))
 BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
 
 
-all:    $(BEAMS)
+all:    $(ERLBEHAVBEAMS) $(BEAMS)
+
+$(BEAMS): $(ERLBEHAVBEAMS)
 
 $(OUTDIR)/%.beam:       %.erl
 	@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
-- 
2.40.0