Reorder build order to ensure -llutil is available -llber and

-llber is available for -llunicode.  Add -llber to ucgendat
(to pick up snprintf).

diff --git a/libraries/Makefile.in b/libraries/Makefile.in
index f07cb00fde2967a4160abf09d9a13793b6e10071..28ab9116e21f5ab9caf0f1bdf3ed45228fcc60aa 100644 (file)
--- a/libraries/Makefile.in
+++ b/libraries/Makefile.in
@@ -4,7 +4,8 @@
 ##
 ## Libraries Makefile for OpenLDAP
 
-SUBDIRS= liblutil liblunicode libldif \
-       liblber libldap libldap_r \
+SUBDIRS= liblutil liblber \
+       liblunicode libldif \
+       libldap libldap_r \
        libavl libldbm librewrite
 

diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in
index cae30fbc5496645bf8837f513578edd61cab5462..557a8191eb657bed5614e749f00dfa39cac77add 100644 (file)
--- a/libraries/liblber/Makefile.in
+++ b/libraries/liblber/Makefile.in
@@ -17,7 +17,7 @@ LIB_DEFS = -DLBER_LIBRARY
 
 SRCS= assert.c decode.c encode.c io.c bprint.c debug.c \
        memory.c options.c sockbuf.c $(@PLAT@_SRCS)
-OBJS= assert.lo decode.lo encode.lo io.lo bprint.lo debug.lo\
+OBJS= assert.lo decode.lo encode.lo io.lo bprint.lo debug.lo \
        memory.lo options.lo sockbuf.lo $(@PLAT@_OBJS)
 XSRCS= version.c
 

diff --git a/libraries/liblunicode/Makefile.in b/libraries/liblunicode/Makefile.in
index ef2e3614a0b31f3ac7d4e1b22059486e376f5791..e56befe87c6fc82c918165caaf1f9cd6ed41bc76 100644 (file)
--- a/libraries/liblunicode/Makefile.in
+++ b/libraries/liblunicode/Makefile.in
@@ -14,7 +14,7 @@ SRCS  = ucstr.c
 OBJS   = ucdata.o ure.o urestubs.o ucstr.o
 
 XLIB = $(LIBRARY)
-XLIBS = $(LDAP_LIBLUTIL_A)
+XLIBS = $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
 PROGRAMS = ucgendat
 
 LDAP_INCDIR= ../../include