25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00

* 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
This commit is contained in:
Badlop 2007-12-17 18:59:51 +00:00
parent f114517bbc
commit 60f8b0772e
12 changed files with 109 additions and 148 deletions

View File

@ -1,5 +1,19 @@
2007-12-17 Badlop <badlop@process-one.net> 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 * doc/guide.tex: Remove 'ssl' option from documentation and
configuration load (EJAB-461) configuration load (EJAB-461)
* src/ejabberd_listener.erl: Likewise * src/ejabberd_listener.erl: Likewise

View File

@ -19,21 +19,18 @@ else
DYNAMIC_LIB_CFLAGS = -fpic -shared DYNAMIC_LIB_CFLAGS = -fpic -shared
endif endif
SUBDIRS =
ERLSHLIBS = ../ejabberd_zlib_drv.so
OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
# make debug=true to compile Erlang module with debug informations. # make debug=true to compile Erlang module with debug informations.
ifdef debug ifdef debug
EFLAGS+=+debug_info EFLAGS+=+debug_info
endif endif
OBJS = \ ERLSHLIBS = ../ejabberd_zlib_drv.so
$(OUTDIR)/ejabberd_zlib.beam OUTDIR = ..
SOURCES = $(wildcard *.erl)
BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
all: $(OBJS) $(ERLSHLIBS) all: $(BEAMS) $(ERLSHLIBS)
$(OUTDIR)/%.beam: %.erl $(OUTDIR)/%.beam: %.erl
@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $< @ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
@ -49,7 +46,7 @@ $(ERLSHLIBS): ../%.so: %.c
-o $@ $(DYNAMIC_LIB_CFLAGS) -o $@ $(DYNAMIC_LIB_CFLAGS)
clean: clean:
rm -f $(OBJS) $(ERLSHLIBS) rm -f $(BEAMS) $(ERLSHLIBS)
distclean: clean distclean: clean
rm -f Makefile rm -f Makefile

View File

@ -9,23 +9,18 @@ LIBS = @LIBS@
ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@
ERLANG_LIBS = @ERLANG_LIBS@ ERLANG_LIBS = @ERLANG_LIBS@
SUBDIRS =
OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
# make debug=true to compile Erlang module with debug informations. # make debug=true to compile Erlang module with debug informations.
ifdef debug ifdef debug
EFLAGS+=+debug_info EFLAGS+=+debug_info
endif endif
OBJS = \ OUTDIR = ..
$(OUTDIR)/eldap.beam \ SOURCES = $(wildcard *.erl)
$(OUTDIR)/ELDAPv3.beam \ BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
$(OUTDIR)/eldap_filter.beam \
$(OUTDIR)/eldap_utils.beam \
$(OUTDIR)/eldap_pool.beam
all: $(OBJS)
all: $(BEAMS)
ELDAPv3.erl: ELDAPv3.asn ELDAPv3.erl: ELDAPv3.asn
@ERLC@ -bber_bin -W $(EFLAGS) $< @ERLC@ -bber_bin -W $(EFLAGS) $<
@ -33,13 +28,12 @@ ELDAPv3.erl: ELDAPv3.asn
$(OUTDIR)/%.beam: %.erl ELDAPv3.erl $(OUTDIR)/%.beam: %.erl ELDAPv3.erl
@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $< @ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
clean: clean:
rm -f ELDAPv3.asn1db rm -f ELDAPv3.asn1db
rm -f ELDAPv3.erl rm -f ELDAPv3.erl
rm -f ELDAPv3.hrl rm -f ELDAPv3.hrl
rm -f ELDAPv3.beam rm -f ELDAPv3.beam
rm -f $(OBJS) rm -f $(BEAMS)
distclean: clean distclean: clean
rm -f Makefile rm -f Makefile

View File

@ -16,23 +16,18 @@ else
DYNAMIC_LIB_CFLAGS = -fpic -shared DYNAMIC_LIB_CFLAGS = -fpic -shared
endif endif
SUBDIRS =
ERLSHLIBS = ../iconv_erl.so
OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
# make debug=true to compile Erlang module with debug informations. # make debug=true to compile Erlang module with debug informations.
ifdef debug ifdef debug
EFLAGS+=+debug_info EFLAGS+=+debug_info
endif endif
OBJS = \ ERLSHLIBS = ../iconv_erl.so
$(OUTDIR)/mod_irc.beam \ OUTDIR = ..
$(OUTDIR)/mod_irc_connection.beam \ SOURCES = $(wildcard *.erl)
$(OUTDIR)/iconv.beam BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
all: $(OBJS) $(ERLSHLIBS) all: $(BEAMS) $(ERLSHLIBS)
$(OUTDIR)/%.beam: %.erl $(OUTDIR)/%.beam: %.erl
@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $< @ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
@ -47,7 +42,7 @@ $(ERLSHLIBS): ../%.so: %.c
-o $@ $(DYNAMIC_LIB_CFLAGS) -o $@ $(DYNAMIC_LIB_CFLAGS)
clean: clean:
rm -f $(OBJS) $(ERLSHLIBS) rm -f $(BEAMS) $(ERLSHLIBS)
distclean: clean distclean: clean
rm -f Makefile rm -f Makefile

View File

@ -9,9 +9,6 @@ LIBS = @LIBS@
ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@
ERLANG_LIBS = @ERLANG_LIBS@ ERLANG_LIBS = @ERLANG_LIBS@
SUBDIRS =
OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
# make debug=true to compile Erlang module with debug informations. # make debug=true to compile Erlang module with debug informations.
ifdef debug ifdef debug
@ -22,19 +19,18 @@ ifeq (@transient_supervisors@, false)
EFLAGS+=-DNO_TRANSIENT_SUPERVISORS EFLAGS+=-DNO_TRANSIENT_SUPERVISORS
endif 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 $(OUTDIR)/%.beam: %.erl
@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $< @ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
clean: clean:
rm -f $(OBJS) rm -f $(BEAMS)
distclean: clean distclean: clean
rm -f Makefile rm -f Makefile

View File

@ -9,29 +9,24 @@ LIBS = @LIBS@
ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@
ERLANG_LIBS = @ERLANG_LIBS@ ERLANG_LIBS = @ERLANG_LIBS@
SUBDIRS =
OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
# make debug=true to compile Erlang module with debug informations. # make debug=true to compile Erlang module with debug informations.
ifdef debug ifdef debug
EFLAGS+=+debug_info EFLAGS+=+debug_info
endif endif
OBJS = \ OUTDIR = ..
$(OUTDIR)/mod_proxy65.beam \ SOURCES = $(wildcard *.erl)
$(OUTDIR)/mod_proxy65_service.beam \ BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
$(OUTDIR)/mod_proxy65_sm.beam \
$(OUTDIR)/mod_proxy65_stream.beam \
$(OUTDIR)/mod_proxy65_lib.beam
all: $(OBJS)
all: $(BEAMS)
$(OUTDIR)/%.beam: %.erl $(OUTDIR)/%.beam: %.erl
@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $< @ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
clean: clean:
rm -f $(OBJS) rm -f $(BEAMS)
distclean: clean distclean: clean
rm -f Makefile rm -f Makefile

View File

@ -9,36 +9,24 @@ LIBS = @LIBS@
ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@
ERLANG_LIBS = @ERLANG_LIBS@ ERLANG_LIBS = @ERLANG_LIBS@
SUBDIRS =
OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
# make debug=true to compile Erlang module with debug informations. # make debug=true to compile Erlang module with debug informations.
ifdef debug ifdef debug
EFLAGS+=+debug_info EFLAGS+=+debug_info
endif endif
OBJS = \ OUTDIR = ..
$(OUTDIR)/gen_pubsub_node.beam \ SOURCES = $(wildcard *.erl)
$(OUTDIR)/gen_pubsub_nodetree.beam \ BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.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)
all: $(BEAMS)
$(OUTDIR)/%.beam: %.erl $(OUTDIR)/%.beam: %.erl
@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $< @ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
clean: clean:
rm -f $(OBJS) rm -f $(BEAMS)
distclean: clean distclean: clean
rm -f Makefile rm -f Makefile

View File

@ -9,28 +9,24 @@ LIBS = @LIBS@
ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@
ERLANG_LIBS = @ERLANG_LIBS@ ERLANG_LIBS = @ERLANG_LIBS@
SUBDIRS =
OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
# make debug=true to compile Erlang module with debug informations. # make debug=true to compile Erlang module with debug informations.
ifdef debug ifdef debug
EFLAGS+=+debug_info EFLAGS+=+debug_info
endif endif
OBJS = \ OUTDIR = ..
$(OUTDIR)/ejabberd_odbc.beam \ SOURCES = $(wildcard *.erl)
$(OUTDIR)/ejabberd_odbc_sup.beam \ BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
$(OUTDIR)/odbc_queries.beam
all: $(OBJS)
all: $(BEAMS)
$(OUTDIR)/%.beam: %.erl $(OUTDIR)/%.beam: %.erl
@ERLC@ -W $(EFLAGS) -D@db_type@ -o $(OUTDIR) $< @ERLC@ -W $(EFLAGS) -D@db_type@ -o $(OUTDIR) $<
clean: clean:
rm -f $(OBJS) rm -f $(BEAMS)
distclean: clean distclean: clean
rm -f Makefile rm -f Makefile

View File

@ -9,21 +9,19 @@ LIBS = @LIBS@ @PAM_LIBS@
ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@
ERLANG_LIBS = @ERLANG_LIBS@ ERLANG_LIBS = @ERLANG_LIBS@
SUBDIRS =
ERLSHLIBS = ../epam
OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
# make debug=true to compile Erlang module with debug informations. # make debug=true to compile Erlang module with debug informations.
ifdef debug ifdef debug
EFLAGS+=+debug_info EFLAGS+=+debug_info
endif endif
OBJS = \ ERLSHLIBS = ../epam
$(OUTDIR)/epam.beam OUTDIR = ..
SOURCES = $(wildcard *.erl)
BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
all: $(OBJS) $(ERLSHLIBS)
all: $(BEAMS) $(ERLSHLIBS)
$(OUTDIR)/%.beam: %.erl $(OUTDIR)/%.beam: %.erl
@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $< @ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
@ -38,7 +36,7 @@ $(ERLSHLIBS): ../%: %.c
-o $@ -lpthread -o $@ -lpthread
clean: clean:
rm -f $(OBJS) $(ERLSHLIBS) rm -f $(BEAMS) $(ERLSHLIBS)
distclean: clean distclean: clean
rm -f Makefile rm -f Makefile

View File

@ -16,22 +16,19 @@ else
DYNAMIC_LIB_CFLAGS = -fpic -shared DYNAMIC_LIB_CFLAGS = -fpic -shared
endif endif
SUBDIRS =
ERLSHLIBS = ../stringprep_drv.so
OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
# make debug=true to compile Erlang module with debug informations. # make debug=true to compile Erlang module with debug informations.
ifdef debug ifdef debug
EFLAGS+=+debug_info EFLAGS+=+debug_info
endif endif
OBJS = \ ERLSHLIBS = ../stringprep_drv.so
$(OUTDIR)/stringprep.beam \ OUTDIR = ..
$(OUTDIR)/stringprep_sup.beam SOURCES = $(wildcard *.erl)
BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
all: $(OBJS) $(ERLSHLIBS)
all: $(BEAMS) $(ERLSHLIBS)
$(OUTDIR)/%.beam: %.erl $(OUTDIR)/%.beam: %.erl
@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $< @ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
@ -46,7 +43,7 @@ $(ERLSHLIBS): ../%.so: %.c uni_data.c uni_norm.c
-o $@ $(DYNAMIC_LIB_CFLAGS) -o $@ $(DYNAMIC_LIB_CFLAGS)
clean: clean:
rm -f $(OBJS) $(ERLSHLIBS) rm -f $(BEAMS) $(ERLSHLIBS)
distclean: clean distclean: clean
rm -f Makefile rm -f Makefile

View File

@ -19,21 +19,19 @@ else
DYNAMIC_LIB_CFLAGS = -fpic -shared DYNAMIC_LIB_CFLAGS = -fpic -shared
endif endif
SUBDIRS =
ERLSHLIBS = ../tls_drv.so
OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
# make debug=true to compile Erlang module with debug informations. # make debug=true to compile Erlang module with debug informations.
ifdef debug ifdef debug
EFLAGS+=+debug_info EFLAGS+=+debug_info
endif endif
OBJS = \ ERLSHLIBS = ../tls_drv.so
$(OUTDIR)/tls.beam OUTDIR = ..
SOURCES = $(wildcard *.erl)
BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
all: $(OBJS) $(ERLSHLIBS)
all: $(BEAMS) $(ERLSHLIBS)
$(OUTDIR)/%.beam: %.erl $(OUTDIR)/%.beam: %.erl
@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $< @ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
@ -49,7 +47,7 @@ $(ERLSHLIBS): ../%.so: %.c
-o $@ $(DYNAMIC_LIB_CFLAGS) -o $@ $(DYNAMIC_LIB_CFLAGS)
clean: clean:
rm -f $(OBJS) $(ERLSHLIBS) rm -f $(BEAMS) $(ERLSHLIBS)
distclean: clean distclean: clean
rm -f Makefile rm -f Makefile

View File

@ -9,30 +9,23 @@ LIBS = @LIBS@
ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_CFLAGS = @ERLANG_CFLAGS@
ERLANG_LIBS = @ERLANG_LIBS@ ERLANG_LIBS = @ERLANG_LIBS@
SUBDIRS =
OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
# make debug=true to compile Erlang module with debug informations. # make debug=true to compile Erlang module with debug informations.
ifdef debug ifdef debug
EFLAGS+=+debug_info EFLAGS+=+debug_info
endif endif
OBJS = \ SOURCES = $(wildcard *.erl)
$(OUTDIR)/ejabberd_http.beam \ OUTDIR = ..
$(OUTDIR)/ejabberd_web.beam \ BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
$(OUTDIR)/ejabberd_web_admin.beam \
$(OUTDIR)/ejabberd_http_poll.beam
all: $(OBJS) all: $(BEAMS)
$(OUTDIR)/%.beam: %.erl ejabberd_http.hrl $(OUTDIR)/%.beam: %.erl ejabberd_http.hrl
@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $< @ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
clean: clean:
rm -f $(OBJS) rm -f $(BEAMS)
distclean: clean distclean: clean
rm -f Makefile rm -f Makefile