From 5c73d160cc12601ca49abb06efd51e0c07afbb89 Mon Sep 17 00:00:00 2001 From: Badlop Date: Fri, 6 Mar 2009 11:34:27 +0000 Subject: [PATCH] Merge 1682 from trunk. * src/eldap/Makefile.in: added +optimize and +driver compilation options (thanks to Evgeniy Khramtsov) * src/eldap/Makefile.win32: Likewise SVN Revision: 1971 --- ChangeLog | 6 ++++++ src/eldap/Makefile.in | 4 +++- src/eldap/Makefile.win32 | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ffcb1d8ce..6fd627c93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-03-06 Badlop + + * src/eldap/Makefile.in: added +optimize and +driver compilation + options (thanks to Evgeniy Khramtsov) + * src/eldap/Makefile.win32: Likewise + 2009-03-05 Badlop * src/ejabberd_app.erl: In a Windows machine, explicitly add the diff --git a/src/eldap/Makefile.in b/src/eldap/Makefile.in index 1c9b7ca22..fbb427ff1 100644 --- a/src/eldap/Makefile.in +++ b/src/eldap/Makefile.in @@ -6,6 +6,8 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ +ASN_FLAGS = -bber_bin +optimize +driver + ERLANG_CFLAGS = @ERLANG_CFLAGS@ ERLANG_LIBS = @ERLANG_LIBS@ @@ -25,7 +27,7 @@ all: $(BEAMS) ELDAPv3.beam ELDAPv3.beam: ELDAPv3.erl ELDAPv3.erl: ELDAPv3.asn - @ERLC@ -bber_bin -W $(EFLAGS) $< + @ERLC@ $(ASN_FLAGS) -W $(EFLAGS) $< $(OUTDIR)/%.beam: %.erl ELDAPv3.erl @ERLC@ -W $(EFLAGS) -o $(OUTDIR) $< diff --git a/src/eldap/Makefile.win32 b/src/eldap/Makefile.win32 index 9733055f9..396880a86 100644 --- a/src/eldap/Makefile.win32 +++ b/src/eldap/Makefile.win32 @@ -6,6 +6,8 @@ EFLAGS = -I .. -pz .. OUTDIR = .. BEAMS = ..\eldap.beam ..\eldap_filter.beam ..\eldap_pool.beam ..\eldap_utils.beam +ASN_FLAGS = -bber_bin +optimize +driver + ALL : $(BEAMS) Clean : @@ -16,7 +18,7 @@ Clean : -@erase $(BEAMS) ELDAPv3.erl : ELDAPv3.asn - erlc -bber_bin -W $(EFLAGS) ELDAPv3.asn + erlc $(ASN_FLAGS) -W $(EFLAGS) ELDAPv3.asn $(OUTDIR)\eldap.beam : eldap.erl ELDAPv3.erl erlc -W $(EFLAGS) -o $(OUTDIR) eldap.erl