* src/ejabberd_zlib/Makefile.in: Compile all erl files found in

the directory, so it isn't needed to provide an explicit list of
target files
* src/eldap/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/mod_muc/Makefile.in: Likewise
* src/mod_proxy65/Makefile.in: Likewise
* src/mod_pubsub/Makefile.in: Likewise
* src/odbc/Makefile.in: Likewise
* src/pam/Makefile.in: Likewise
* src/stringprep/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise
* src/web/Makefile.in: Likewise

SVN Revision: 1075

12 files changed, 110 insertions, 149 deletions

diff --git a/ChangeLog b/ChangeLog
index 4c4200bb..df050db3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2007-12-17  Badlop  <badlop@process-one.net>
 
+	* src/ejabberd_zlib/Makefile.in: Compile all erl files found in
+	the directory, so it isn't needed to provide an explicit list of
+	target files
+	* src/eldap/Makefile.in: Likewise
+	* src/mod_irc/Makefile.in: Likewise
+	* src/mod_muc/Makefile.in: Likewise
+	* src/mod_proxy65/Makefile.in: Likewise
+	* src/mod_pubsub/Makefile.in: Likewise
+	* src/odbc/Makefile.in: Likewise
+	* src/pam/Makefile.in: Likewise
+	* src/stringprep/Makefile.in: Likewise
+	* src/tls/Makefile.in: Likewise
+	* src/web/Makefile.in: Likewise
+
 	* doc/guide.tex: Remove 'ssl' option from documentation and
 	configuration load (EJAB-461)
 	* src/ejabberd_listener.erl: Likewise
diff --git a/src/ejabberd_zlib/Makefile.in b/src/ejabberd_zlib/Makefile.in
index 2de36f45..a40c37d6 100644
--- a/src/ejabberd_zlib/Makefile.in
+++ b/src/ejabberd_zlib/Makefile.in
@@ -13,27 +13,24 @@ ERLANG_CFLAGS = @ERLANG_CFLAGS@
 ERLANG_LIBS = @ERLANG_LIBS@
 
 ifeq ($(shell uname),Darwin)
-DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
+	DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
 else
-# Assume Linux-style dynamic library flags
-DYNAMIC_LIB_CFLAGS = -fpic -shared
+	# Assume Linux-style dynamic library flags
+	DYNAMIC_LIB_CFLAGS = -fpic -shared
 endif
 
-SUBDIRS = 
-
-ERLSHLIBS = ../ejabberd_zlib_drv.so
-
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 # make debug=true to compile Erlang module with debug informations.
 ifdef debug
-  EFLAGS+=+debug_info
+	EFLAGS+=+debug_info
 endif
 
-OBJS   = \
-	$(OUTDIR)/ejabberd_zlib.beam
+ERLSHLIBS = ../ejabberd_zlib_drv.so
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
 
-all:    $(OBJS) $(ERLSHLIBS)
+all:    $(BEAMS) $(ERLSHLIBS)
 
 $(OUTDIR)/%.beam:       %.erl
 	@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
@@ -49,7 +46,7 @@ $(ERLSHLIBS):	../%.so:	%.c
 			-o $@ $(DYNAMIC_LIB_CFLAGS)
 
 clean:
-	rm -f $(OBJS) $(ERLSHLIBS)
+	rm -f $(BEAMS) $(ERLSHLIBS)
 
 distclean: clean
 	rm -f Makefile
diff --git a/src/eldap/Makefile.in b/src/eldap/Makefile.in
index 6953929f..0b827362 100644
--- a/src/eldap/Makefile.in
+++ b/src/eldap/Makefile.in
@@ -9,23 +9,18 @@ LIBS = @LIBS@
 ERLANG_CFLAGS = @ERLANG_CFLAGS@
 ERLANG_LIBS = @ERLANG_LIBS@
 
-SUBDIRS = 
-
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 # make debug=true to compile Erlang module with debug informations.
 ifdef debug
-  EFLAGS+=+debug_info
+	EFLAGS+=+debug_info
 endif
 
-OBJS   = \
-	$(OUTDIR)/eldap.beam \
-	$(OUTDIR)/ELDAPv3.beam \
-	$(OUTDIR)/eldap_filter.beam \
-	$(OUTDIR)/eldap_utils.beam \
-	$(OUTDIR)/eldap_pool.beam
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
 
-all:    $(OBJS)
+
+all:    $(BEAMS)
 
 ELDAPv3.erl:       ELDAPv3.asn
 	@ERLC@ -bber_bin -W $(EFLAGS) $<
@@ -33,13 +28,12 @@ ELDAPv3.erl:       ELDAPv3.asn
 $(OUTDIR)/%.beam:	%.erl ELDAPv3.erl
 	@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
 
-
 clean:
 	rm -f ELDAPv3.asn1db
 	rm -f ELDAPv3.erl
 	rm -f ELDAPv3.hrl
 	rm -f ELDAPv3.beam
-	rm -f $(OBJS)
+	rm -f $(BEAMS)
 
 distclean: clean
 	rm -f Makefile
diff --git a/src/mod_irc/Makefile.in b/src/mod_irc/Makefile.in
index 10eb9939..d62ac20b 100644
--- a/src/mod_irc/Makefile.in
+++ b/src/mod_irc/Makefile.in
@@ -1,38 +1,33 @@
 # $Id$
- 
+
 CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@ @LIBICONV@
- 
+
 ERLANG_CFLAGS = @ERLANG_CFLAGS@
 ERLANG_LIBS = @ERLANG_LIBS@
 
 ifeq ($(shell uname),Darwin)
-DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
+	DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
 else
-# Assume Linux-style dynamic library flags
-DYNAMIC_LIB_CFLAGS = -fpic -shared
+	# Assume Linux-style dynamic library flags
+	DYNAMIC_LIB_CFLAGS = -fpic -shared
 endif
 
-SUBDIRS = 
-
-ERLSHLIBS = ../iconv_erl.so
-
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 # make debug=true to compile Erlang module with debug informations.
 ifdef debug
-  EFLAGS+=+debug_info
+	EFLAGS+=+debug_info
 endif
 
-OBJS   = \
-	$(OUTDIR)/mod_irc.beam \
-	$(OUTDIR)/mod_irc_connection.beam \
-	$(OUTDIR)/iconv.beam
+ERLSHLIBS = ../iconv_erl.so
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
 
-all:    $(OBJS) $(ERLSHLIBS)
+all:    $(BEAMS) $(ERLSHLIBS)
 
 $(OUTDIR)/%.beam:       %.erl
 	@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
@@ -47,7 +42,7 @@ $(ERLSHLIBS):	../%.so:	%.c
 			-o $@ $(DYNAMIC_LIB_CFLAGS)
 
 clean:
-	rm -f $(OBJS) $(ERLSHLIBS)
+	rm -f $(BEAMS) $(ERLSHLIBS)
 
 distclean: clean
 	rm -f Makefile
diff --git a/src/mod_muc/Makefile.in b/src/mod_muc/Makefile.in
index cd3575b2..8aa3bf5e 100644
--- a/src/mod_muc/Makefile.in
+++ b/src/mod_muc/Makefile.in
@@ -9,32 +9,28 @@ LIBS = @LIBS@
 ERLANG_CFLAGS = @ERLANG_CFLAGS@
 ERLANG_LIBS = @ERLANG_LIBS@
 
-SUBDIRS = 
-
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 # make debug=true to compile Erlang module with debug informations.
 ifdef debug
-  EFLAGS+=+debug_info
+	EFLAGS+=+debug_info
 endif
 
 ifeq (@transient_supervisors@, false)
-  EFLAGS+=-DNO_TRANSIENT_SUPERVISORS
+	EFLAGS+=-DNO_TRANSIENT_SUPERVISORS
 endif
 
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
 
-OBJS   = \
-	$(OUTDIR)/mod_muc.beam \
-	$(OUTDIR)/mod_muc_log.beam \
-	$(OUTDIR)/mod_muc_room.beam
 
-all:    $(OBJS)
+all:    $(BEAMS)
 
 $(OUTDIR)/%.beam:       %.erl
 	@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
 
 clean:
-	rm -f $(OBJS)
+	rm -f $(BEAMS)
 
 distclean: clean
 	rm -f Makefile
diff --git a/src/mod_proxy65/Makefile.in b/src/mod_proxy65/Makefile.in
index ca245b7d..b9eba426 100644
--- a/src/mod_proxy65/Makefile.in
+++ b/src/mod_proxy65/Makefile.in
@@ -5,33 +5,28 @@ CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
- 
+
 ERLANG_CFLAGS = @ERLANG_CFLAGS@
 ERLANG_LIBS = @ERLANG_LIBS@
 
-SUBDIRS = 
-
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 # make debug=true to compile Erlang module with debug informations.
 ifdef debug
-  EFLAGS+=+debug_info
+	EFLAGS+=+debug_info
 endif
 
-OBJS   = \
-	$(OUTDIR)/mod_proxy65.beam \
-	$(OUTDIR)/mod_proxy65_service.beam \
-	$(OUTDIR)/mod_proxy65_sm.beam \
-	$(OUTDIR)/mod_proxy65_stream.beam \
-	$(OUTDIR)/mod_proxy65_lib.beam
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+
 
-all:    $(OBJS)
+all:    $(BEAMS)
 
 $(OUTDIR)/%.beam:       %.erl
 	@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
 
 clean:
-	rm -f $(OBJS)
+	rm -f $(BEAMS)
 
 distclean: clean
 	rm -f Makefile
diff --git a/src/mod_pubsub/Makefile.in b/src/mod_pubsub/Makefile.in
index 8648b948..b9eba426 100644
--- a/src/mod_pubsub/Makefile.in
+++ b/src/mod_pubsub/Makefile.in
@@ -9,36 +9,24 @@ LIBS = @LIBS@
 ERLANG_CFLAGS = @ERLANG_CFLAGS@
 ERLANG_LIBS = @ERLANG_LIBS@
 
-SUBDIRS = 
-
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 # make debug=true to compile Erlang module with debug informations.
 ifdef debug
-EFLAGS+=+debug_info
+	EFLAGS+=+debug_info
 endif
 
-OBJS   = \
-	$(OUTDIR)/gen_pubsub_node.beam \
-	$(OUTDIR)/gen_pubsub_nodetree.beam \
-	$(OUTDIR)/nodetree_default.beam \
-	$(OUTDIR)/nodetree_virtual.beam \
-	$(OUTDIR)/mod_pubsub.beam \
-	$(OUTDIR)/node_default.beam \
-	$(OUTDIR)/node_pep.beam \
-	$(OUTDIR)/node_buddy.beam \
-	$(OUTDIR)/node_club.beam \
-	$(OUTDIR)/node_dispatch.beam \
-	$(OUTDIR)/node_private.beam \
-	$(OUTDIR)/node_public.beam
-
-all:    $(OBJS)
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+
+
+all:    $(BEAMS)
 
 $(OUTDIR)/%.beam:       %.erl
 	@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
 
 clean:
-	rm -f $(OBJS)
+	rm -f $(BEAMS)
 
 distclean: clean
 	rm -f Makefile
diff --git a/src/odbc/Makefile.in b/src/odbc/Makefile.in
index e2911500..974517c5 100644
--- a/src/odbc/Makefile.in
+++ b/src/odbc/Makefile.in
@@ -9,28 +9,24 @@ LIBS = @LIBS@
 ERLANG_CFLAGS = @ERLANG_CFLAGS@
 ERLANG_LIBS = @ERLANG_LIBS@
 
-SUBDIRS = 
-
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 # make debug=true to compile Erlang module with debug informations.
 ifdef debug
-  EFLAGS+=+debug_info
+	EFLAGS+=+debug_info
 endif
 
-OBJS   = \
-	$(OUTDIR)/ejabberd_odbc.beam \
-	$(OUTDIR)/ejabberd_odbc_sup.beam \
-	$(OUTDIR)/odbc_queries.beam
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
 
-all:    $(OBJS)
+
+all:    $(BEAMS)
 
 $(OUTDIR)/%.beam:       %.erl
 	@ERLC@ -W $(EFLAGS) -D@db_type@ -o $(OUTDIR) $<
 
-
 clean:
-	rm -f $(OBJS)
+	rm -f $(BEAMS)
 
 distclean: clean
 	rm -f Makefile
diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in
index 64aff30b..d86b119b 100644
--- a/src/pam/Makefile.in
+++ b/src/pam/Makefile.in
@@ -5,25 +5,23 @@ CFLAGS = @CFLAGS@ @PAM_CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@ @PAM_LIBS@
- 
+
 ERLANG_CFLAGS = @ERLANG_CFLAGS@
 ERLANG_LIBS = @ERLANG_LIBS@
 
-SUBDIRS = 
-
-ERLSHLIBS = ../epam
-
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 # make debug=true to compile Erlang module with debug informations.
 ifdef debug
-  EFLAGS+=+debug_info
+	EFLAGS+=+debug_info
 endif
 
-OBJS   = \
-	$(OUTDIR)/epam.beam
+ERLSHLIBS = ../epam
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+
 
-all:    $(OBJS) $(ERLSHLIBS)
+all:    $(BEAMS) $(ERLSHLIBS)
 
 $(OUTDIR)/%.beam:       %.erl
 	@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
@@ -38,7 +36,7 @@ $(ERLSHLIBS):	../%:	%.c
 			-o $@ -lpthread
 
 clean:
-	rm -f $(OBJS) $(ERLSHLIBS)
+	rm -f $(BEAMS) $(ERLSHLIBS)
 
 distclean: clean
 	rm -f Makefile
diff --git a/src/stringprep/Makefile.in b/src/stringprep/Makefile.in
index d69a2772..99efbeb3 100644
--- a/src/stringprep/Makefile.in
+++ b/src/stringprep/Makefile.in
@@ -10,28 +10,25 @@ ERLANG_CFLAGS = @ERLANG_CFLAGS@
 ERLANG_LIBS = @ERLANG_LIBS@
 
 ifeq ($(shell uname),Darwin)
-DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
+	DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
 else
-# Assume Linux-style dynamic library flags
-DYNAMIC_LIB_CFLAGS = -fpic -shared
+	# Assume Linux-style dynamic library flags
+	DYNAMIC_LIB_CFLAGS = -fpic -shared
 endif
 
-SUBDIRS = 
-
-ERLSHLIBS = ../stringprep_drv.so
-
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 # make debug=true to compile Erlang module with debug informations.
 ifdef debug
-  EFLAGS+=+debug_info
+	EFLAGS+=+debug_info
 endif
 
-OBJS   = \
-	$(OUTDIR)/stringprep.beam \
-	$(OUTDIR)/stringprep_sup.beam
+ERLSHLIBS = ../stringprep_drv.so
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+
 
-all:    $(OBJS) $(ERLSHLIBS)
+all:    $(BEAMS) $(ERLSHLIBS)
 
 $(OUTDIR)/%.beam:       %.erl
 	@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
@@ -46,7 +43,7 @@ $(ERLSHLIBS):	../%.so:	%.c uni_data.c uni_norm.c
 			-o $@ $(DYNAMIC_LIB_CFLAGS)
 
 clean:
-	rm -f $(OBJS) $(ERLSHLIBS)
+	rm -f $(BEAMS) $(ERLSHLIBS)
 
 distclean: clean
 	rm -f Makefile
diff --git a/src/tls/Makefile.in b/src/tls/Makefile.in
index 60ab3198..cb90a310 100644
--- a/src/tls/Makefile.in
+++ b/src/tls/Makefile.in
@@ -13,27 +13,25 @@ ERLANG_CFLAGS = @ERLANG_CFLAGS@
 ERLANG_LIBS = @ERLANG_LIBS@
 
 ifeq ($(shell uname),Darwin)
-DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
+	DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
 else
-# Assume Linux-style dynamic library flags
-DYNAMIC_LIB_CFLAGS = -fpic -shared
+	# Assume Linux-style dynamic library flags
+	DYNAMIC_LIB_CFLAGS = -fpic -shared
 endif
 
-SUBDIRS = 
-
-ERLSHLIBS = ../tls_drv.so
-
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 # make debug=true to compile Erlang module with debug informations.
 ifdef debug
-  EFLAGS+=+debug_info
+	EFLAGS+=+debug_info
 endif
 
-OBJS   = \
-	$(OUTDIR)/tls.beam
+ERLSHLIBS = ../tls_drv.so
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+
 
-all:    $(OBJS) $(ERLSHLIBS)
+all:    $(BEAMS) $(ERLSHLIBS)
 
 $(OUTDIR)/%.beam:       %.erl
 	@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
@@ -49,7 +47,7 @@ $(ERLSHLIBS):	../%.so:	%.c
 			-o $@ $(DYNAMIC_LIB_CFLAGS)
 
 clean:
-	rm -f $(OBJS) $(ERLSHLIBS)
+	rm -f $(BEAMS) $(ERLSHLIBS)
 
 distclean: clean
 	rm -f Makefile
diff --git a/src/web/Makefile.in b/src/web/Makefile.in
index 6549b667..7c4732da 100644
--- a/src/web/Makefile.in
+++ b/src/web/Makefile.in
@@ -9,30 +9,23 @@ LIBS = @LIBS@
 ERLANG_CFLAGS = @ERLANG_CFLAGS@
 ERLANG_LIBS = @ERLANG_LIBS@
 
-SUBDIRS = 
-
-
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 # make debug=true to compile Erlang module with debug informations.
 ifdef debug
-  EFLAGS+=+debug_info
+	EFLAGS+=+debug_info
 endif
 
-OBJS   = \
-	$(OUTDIR)/ejabberd_http.beam \
-	$(OUTDIR)/ejabberd_web.beam  \
-	$(OUTDIR)/ejabberd_web_admin.beam  \
-	$(OUTDIR)/ejabberd_http_poll.beam
+SOURCES = $(wildcard *.erl)
+OUTDIR = ..
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
 
-all:    $(OBJS)
+all: $(BEAMS)
 
 $(OUTDIR)/%.beam:	%.erl ejabberd_http.hrl
 	@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
 
-
 clean:
-	rm -f $(OBJS)
+	rm -f $(BEAMS)
 
 distclean: clean
 	rm -f Makefile