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

@@ -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

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) $<

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