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

diff --git a/ChangeLog b/ChangeLog
index ffcb1d8ce95563f0fc6720e3c57087ff77a779b0..6fd627c93a0321130aa627a7662ece74881bebeb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-06  Badlop  <badlop@process-one.net>
+
+       * src/eldap/Makefile.in: added +optimize and +driver compilation
+       options (thanks to Evgeniy Khramtsov)
+       * src/eldap/Makefile.win32: Likewise
+
 2009-03-05  Badlop  <badlop@process-one.net>
 
        * src/ejabberd_app.erl: In a Windows machine, explicitly add the

diff --git a/src/eldap/Makefile.in b/src/eldap/Makefile.in
index 1c9b7ca2216122a13d80c362f96e3566458833a0..fbb427ff1b21f6618efc87ffda45c45c986eb091 100644 (file)
--- 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 9733055f9a193eb825503d38a475b89fe5743b6c..396880a86bd48da83d231452a002c0696ca47df0 100644 (file)
--- 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