* src/ejabberd_zlib/Makefile.win32: Compile

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

SVN Revision: 1076

diff --git a/ChangeLog b/ChangeLog
index df050db3a07f5d67070547e638f9fd81a501bd46..67e65b44fdbba7000223740fb181153c4fb16052 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,16 @@
        * src/stringprep/Makefile.in: Likewise
        * src/tls/Makefile.in: Likewise
        * src/web/Makefile.in: Likewise
+       * src/ejabberd_zlib/Makefile.win32: Likewise
+       * src/eldap/Makefile.win32: Likewise
+       * src/mod_irc/Makefile.win32: Likewise
+       * src/mod_muc/Makefile.win32: Likewise
+       * src/mod_proxy65/Makefile.win32: Likewise
+       * src/mod_pubsub/Makefile.win32: Likewise
+       * src/odbc/Makefile.win32: Likewise
+       * src/stringprep/Makefile.win32: Likewise
+       * src/tls/Makefile.win32: Likewise
+       * src/web/Makefile.win32: Likewise
 
        * doc/guide.tex: Remove 'ssl' option from documentation and
        configuration load (EJAB-461)

diff --git a/src/ejabberd_zlib/Makefile.win32 b/src/ejabberd_zlib/Makefile.win32
index e2d05f519e478a2c31245e7157d5b714d04b17b6..bd9c9d56165927255cffb9506e7bd6ca45a5c9c2 100644 (file)
--- a/src/ejabberd_zlib/Makefile.win32
+++ b/src/ejabberd_zlib/Makefile.win32
@@ -1,24 +1,24 @@
 
 include ..\Makefile.inc
 
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 
-OBJS = \
-       $(OUTDIR)\ejabberd_zlib.beam
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
 
 SOURCE = ejabberd_zlib_drv.c
 OBJECT = ejabberd_zlib_drv.o
 DLL    = $(OUTDIR)\ejabberd_zlib_drv.dll
 
-ALL : $(DLL) $(OBJS)
+ALL : $(DLL) $(BEAMS)
 
 CLEAN :
        -@erase $(DLL)
        -@erase $(OUTDIR)\ejabberd_zlib_drv.exp
        -@erase $(OUTDIR)\ejabberd_zlib_drv.lib
        -@erase $(OBJECT)
-       -@erase $(OBJS)
+       -@erase $(BEAMS)
 
 $(OUTDIR)\ejabberd_zlib.beam : ejabberd_zlib.erl
        erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_zlib.erl

diff --git a/src/eldap/Makefile.win32 b/src/eldap/Makefile.win32
index 1e4c503e60ed62679ef69074a5499606c4f2b86b..b5bdbcf14ee3cb49c17d538f9385faed2174eacb 100644 (file)
--- a/src/eldap/Makefile.win32
+++ b/src/eldap/Makefile.win32
@@ -1,24 +1,20 @@
 
 include ..\Makefile.inc
 
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 
-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)
 
 Clean :
        -@erase ELDAPv3.asn1db
        -@erase ELDAPv3.erl
        -@erase ELDAPv3.hrl
        -@erase ELDAPv3.beam
-       -@erase $(OBJS)
+       -@erase $(BEAMS)
 
 ELDAPv3.erl : ELDAPv3.asn
        erlc -bber_bin -W $(EFLAGS) ELDAPv3.asn

diff --git a/src/mod_irc/Makefile.win32 b/src/mod_irc/Makefile.win32
index cba50e6977d0a02486ef4965d1de1f281ea762c6..28fc15e9cee727568221aa734f98642dbb24d201 100644 (file)
--- a/src/mod_irc/Makefile.win32
+++ b/src/mod_irc/Makefile.win32
@@ -1,26 +1,24 @@
 
 include ..\Makefile.inc
 
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 
-OBJS = \
-       $(OUTDIR)\iconv.beam \
-       $(OUTDIR)\mod_irc.beam \
-       $(OUTDIR)\mod_irc_connection.beam
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
 
 SOURCE = iconv_erl.c
 OBJECT = iconv_erl.o
 DLL    = $(OUTDIR)\iconv_erl.dll
 
-ALL : $(DLL) $(OBJS)
+ALL : $(DLL) $(BEAMS)
 
 CLEAN :
        -@erase $(DLL)
        -@erase $(OUTDIR)\iconv_erl.exp
        -@erase $(OUTDIR)\iconv_erl.lib
        -@erase $(OBJECT)
-       -@erase $(OBJS)
+       -@erase $(BEAMS)
 
 $(OUTDIR)\iconv.beam : iconv.erl
        erlc -W $(EFLAGS) -o $(OUTDIR) iconv.erl

diff --git a/src/mod_muc/Makefile.win32 b/src/mod_muc/Makefile.win32
index 76f6bb7f4be636f2e8bcd2f8cb817c317731a984..e53f9b7f5d38c6c0fe689f9397c7cad3bf7fa6d2 100644 (file)
--- a/src/mod_muc/Makefile.win32
+++ b/src/mod_muc/Makefile.win32
@@ -1,18 +1,16 @@
 
 include ..\Makefile.inc
 
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 
-OBJS = \
-       $(OUTDIR)\mod_muc.beam \
-       $(OUTDIR)\mod_muc_log.beam \
-       $(OUTDIR)\mod_muc_room.beam
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
 
-ALL : $(OBJS)
+ALL : $(BEAMS)
 
 CLEAN :
-       -@erase $(OBJS)
+       -@erase $(BEAMS)
 
 $(OUTDIR)\mod_muc.beam : mod_muc.erl
        erlc -W $(EFLAGS) -o $(OUTDIR) mod_muc.erl

diff --git a/src/mod_proxy65/Makefile.win32 b/src/mod_proxy65/Makefile.win32
index fdab132944cbcff1537c940ab246477c130e7eb5..718dd0c70ae1c3f4fff97d6e18f7c616f6287e9b 100644 (file)
--- a/src/mod_proxy65/Makefile.win32
+++ b/src/mod_proxy65/Makefile.win32
@@ -1,20 +1,16 @@
 
 include ..\Makefile.inc
 
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 
-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)
 
 CLEAN :
-       -@erase $(OBJS)
+       -@erase $(BEAMS)
 
 $(OUTDIR)\mod_proxy65.beam : mod_proxy65.erl
        erlc -W $(EFLAGS) -o $(OUTDIR) mod_proxy65.erl

diff --git a/src/mod_pubsub/Makefile.win32 b/src/mod_pubsub/Makefile.win32
index 8d4e9f99331c56b34b485a328a138c7bf2193aae..f68375ccd38544f5debc9ea74484b5fa60767b4a 100644 (file)
--- a/src/mod_pubsub/Makefile.win32
+++ b/src/mod_pubsub/Makefile.win32
@@ -1,27 +1,16 @@
 
 include ..\Makefile.inc
 
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 
-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)
 
 CLEAN :
-       -@erase $(OBJS)
+       -@erase $(BEAMS)
 
 $(OUTDIR)\gen_pubsub_node.beam : gen_pubsub_node.erl
        erlc -W $(EFLAGS) -o $(OUTDIR) gen_pubsub_node.erl

diff --git a/src/odbc/Makefile.win32 b/src/odbc/Makefile.win32
index cd9fbfbe241d0d2de53bc115b5cc63f75482e931..13b54fb2f2a9f40ef9a9111d6281efe0d871d087 100644 (file)
--- a/src/odbc/Makefile.win32
+++ b/src/odbc/Makefile.win32
@@ -1,18 +1,16 @@
 
 include ..\Makefile.inc
 
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 
-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)
 
 CLEAN :
-       -@erase $(OBJS)
+       -@erase $(BEAMS)
 
 $(OUTDIR)\ejabberd_odbc.beam : ejabberd_odbc.erl
        erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_odbc.erl

diff --git a/src/stringprep/Makefile.win32 b/src/stringprep/Makefile.win32
index 03d7a3dd50a73aaffc3d4425fc9eeb1b9d9f5d97..23f493ff619efe3e98b3cb184a0d599d3c900c6d 100644 (file)
--- a/src/stringprep/Makefile.win32
+++ b/src/stringprep/Makefile.win32
@@ -1,24 +1,25 @@
 
 include ..\Makefile.inc
 
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+
 SOURCE = stringprep_drv.c
 AUXIL  = uni_data.c uni_norm.c
 OBJECT = stringprep_drv.o
 DLL    = $(OUTDIR)\stringprep_drv.dll
 
-ALL : $(DLL) $(OUTDIR)\stringprep.beam \
-       $(OUTDIR)\stringprep_sup.beam
+ALL : $(DLL) $(BEAMS)
 
 CLEAN :
        -@erase $(DLL)
        -@erase $(OUTDIR)\stringprep_drv.exp
        -@erase $(OUTDIR)\stringprep_drv.lib
        -@erase $(OBJECT)
-       -@erase $(OUTDIR)\stringprep.beam
-       -@erase $(OUTDIR)\stringprep_sup.beam
+       -@erase $(BEAMS)
 
 $(OUTDIR)\stringprep.beam : stringprep.erl
        erlc -W $(EFLAGS) -o $(OUTDIR) stringprep.erl

diff --git a/src/tls/Makefile.win32 b/src/tls/Makefile.win32
index 3814d7606585e409e1f167b65de91cc9fd39c753..576112e20553c5b47b9dce120d632337a705116b 100644 (file)
--- a/src/tls/Makefile.win32
+++ b/src/tls/Makefile.win32
@@ -1,24 +1,24 @@
 
 include ..\Makefile.inc
 
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 
-OBJS = \
-       $(OUTDIR)\tls.beam
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
 
 SOURCE = tls_drv.c
 OBJECT = tls_drv.o
 DLL    = $(OUTDIR)\tls_drv.dll
 
-ALL : $(DLL) $(OBJS)
+ALL : $(DLL) $(BEAMS)
 
 CLEAN :
        -@erase $(DLL)
        -@erase $(OUTDIR)\tls_drv.exp
        -@erase $(OUTDIR)\tls_drv.lib
        -@erase $(OBJECT)
-       -@erase $(OBJS)
+       -@erase $(BEAMS)
 
 $(OUTDIR)\tls.beam : tls.erl
        erlc -W $(EFLAGS) -o $(OUTDIR) tls.erl

diff --git a/src/web/Makefile.win32 b/src/web/Makefile.win32
index 70d2e7cd7645caf93efe5d88834de4601c6a04bc..3fc9ce2a13fe2a5158de57cb76a40fab79852a8a 100644 (file)
--- a/src/web/Makefile.win32
+++ b/src/web/Makefile.win32
@@ -1,19 +1,16 @@
 
 include ..\Makefile.inc
 
-OUTDIR = ..
 EFLAGS = -I .. -pz ..
 
-OBJS = \
-       $(OUTDIR)\ejabberd_http.beam \
-       $(OUTDIR)\ejabberd_web.beam  \
-       $(OUTDIR)\ejabberd_web_admin.beam  \
-       $(OUTDIR)\ejabberd_http_poll.beam
+OUTDIR = ..
+SOURCES = $(wildcard *.erl)
+BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
 
-ALL : $(OBJS)
+ALL : $(BEAMS)
 
 CLEAN :
-       -@erase $(OBJS)
+       -@erase $(BEAMS)
 
 $(OUTDIR)\ejabberd_http.beam : ejabberd_http.erl
        erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_http.erl