]> git.sur5r.net Git - openldap/commitdiff
Revert "fix libraries order to build with --enable-dynamic (ITS#6517)"
authorRalf Haferkamp <ralf@openldap.org>
Tue, 1 Nov 2011 14:47:57 +0000 (15:47 +0100)
committerRalf Haferkamp <ralf@openldap.org>
Tue, 1 Nov 2011 15:30:46 +0000 (16:30 +0100)
This reverts commit f8d944cba3b8572bad9bcacf495fce2ba38278ab. Not needed
anymore, since libldif was merged into libldap. Additionally the commit
broke linking with "--as-needed".

build/top.mk

index 41e52b4ed536904c0ee718d0248c733b6f7ef6c0..66ac3bf91d1bea0e62ab34a78aac4c6629d2e462 100644 (file)
@@ -170,12 +170,10 @@ LDAP_LIBREWRITE_A = $(LDAP_LIBDIR)/librewrite/librewrite.a
 LDAP_LIBLUNICODE_A = $(LDAP_LIBDIR)/liblunicode/liblunicode.a
 LDAP_LIBLUTIL_A = $(LDAP_LIBDIR)/liblutil/liblutil.a
 
-LDAP_L = \
-       $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA) \
-       $(LDAP_LIBLUTIL_A)
+LDAP_L = $(LDAP_LIBLUTIL_A) \
+       $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
 SLAPD_L = $(LDAP_LIBLUNICODE_A) $(LDAP_LIBREWRITE_A) \
-       $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) \
-       $(LDAP_LIBLUTIL_A)
+       $(LDAP_LIBLUTIL_A) $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
 
 WRAP_LIBS = @WRAP_LIBS@
 # AutoConfig generated