From ce07fb958e19488710040258e0271fd6c89c9687 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sun, 10 Feb 2002 22:42:51 +0000 Subject: [PATCH] Update libtool usage s/-L.../libraries -lldap/.../libraries/libldap/libldap.la/ --- build/lib-shared.mk | 32 -------------------------- build/lib-static.mk | 4 +--- build/top.mk | 37 ++++++++++++++++++------------- clients/finger/Makefile.in | 4 ++-- clients/mail500/Makefile.in | 4 ++-- clients/maildap/Makefile.in | 4 ++-- clients/tools/Makefile.in | 16 ++++++------- clients/ud/Makefile.in | 4 ++-- include/portable.h.in | 3 --- libraries/libavl/Makefile.in | 4 ++-- libraries/liblber/Makefile.in | 9 ++++---- libraries/libldap/Makefile.in | 11 +++++---- libraries/libldap_r/Makefile.in | 9 ++++---- libraries/libldbm/Makefile.in | 2 +- libraries/liblunicode/Makefile.in | 4 ++-- libraries/librewrite/Makefile.in | 5 +++-- servers/slapd/Makefile.in | 5 ++--- servers/slapd/tools/Makefile.in | 10 ++++----- servers/slurpd/Makefile.in | 4 ++-- tests/progs/Makefile.in | 10 ++++----- 20 files changed, 73 insertions(+), 108 deletions(-) diff --git a/build/lib-shared.mk b/build/lib-shared.mk index 194da6e122..a01e0f27c2 100644 --- a/build/lib-shared.mk +++ b/build/lib-shared.mk @@ -14,40 +14,8 @@ MKDEPFLAG = -l .c.lo: $(LTCOMPILE_LIB) $< -# -# symlinks for libraries: UNIX and Windows (a.k.a. NT) need to be handled -# differently. In UNIX, the static and shared libraries, as well as shared -# library symlinks, can all be symlinked in the 'libraries' directory. In -# Windows, only the static library (.a file) or the shared library (.dll) -# file should be present. The current mingw linker (i.e. ld) WILL look -# for a .dll file at link time and internally generate an import library -# for it. However, ld will not do this if a static library is present. -# That doesn't seem very correct, but that's the behavior, like it or not. -# -# Note that there doesn't seem to be a true need for the .la file at -# this level, so it is left out. -# -# The set of symlinks are determined by examining the library's .la file. -# $(LIBRARY): version.lo $(LTLINK_LIB) -o $@ $(OBJS) version.lo $(LINK_LIBS) - @d=`$(PWD)`; b=`$(BASENAME) $$d`; \ - echo cd ..; \ - cd ..; \ - arlib=`grep '^old_library=' $$b/$@`; \ - arlib=`expr "$$arlib" : "[^']*'\(.*\)'"`; \ - libs=$$arlib; \ - if test "$(BUILD_LIBS_DYNAMIC)" = "shared"; then \ - shlibs=`grep '^library_names' $$b/$@`; \ - shlibs=`expr "$$shlibs" : "[^']*'\(.*\)'"`; \ - libs="$$libs $$shlibs"; \ - fi; \ - for i in $$libs; do \ - echo $(RM) $$i; \ - $(RM) $$i; \ - echo $(LN_S) $$b/.libs/$$i $$i; \ - $(LN_S) $$b/.libs/$$i $$i; \ - done Makefile: $(top_srcdir)/build/lib-shared.mk diff --git a/build/lib-static.mk b/build/lib-static.mk index bd8e726f63..dd110103ea 100644 --- a/build/lib-static.mk +++ b/build/lib-static.mk @@ -9,8 +9,6 @@ $(LIBRARY): version.o $(AR) ru $@ $(OBJS) version.o - @$(RANLIB) $@; \ - $(RM) ../$@; \ - (d=`$(PWD)` ; cd .. ; $(LN_S) `$(BASENAME) $$d`/$@ $@) + @$(RANLIB) $@ Makefile: $(top_srcdir)/build/lib-static.mk diff --git a/build/top.mk b/build/top.mk index f912b9a8c6..935728b547 100644 --- a/build/top.mk +++ b/build/top.mk @@ -91,7 +91,7 @@ LTFLAGS_MOD = $(@PLAT@_LTFLAGS_MOD) LINK_LIBS = $(@PLAT@_LINK_LIBS) LTLINK = $(LIBTOOL) --mode=link \ - $(CC) $(LT_CFLAGS) -static $(LDFLAGS) $(LTFLAGS) + $(CC) -static $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS) LTCOMPILE_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=compile \ $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c @@ -106,6 +106,7 @@ LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \ $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD) LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) +LTFINISH = $(LIBTOOL) --mode=finish # Misc UNIX commands used in build environment AR = @AR@ @@ -139,27 +140,31 @@ MANCOMPRESSSUFFIX= INCLUDEDIR= $(top_srcdir)/include LDAP_INCPATH= -I$(LDAP_INCDIR) -I$(INCLUDEDIR) -LDAP_LIBADIR= $(top_builddir)/libraries -LDAP_LIBPATH= -L$(LDAP_LIBADIR)/libldap -L$(LDAP_LIBADIR)/liblber -L$(LDAP_LIBADIR) +LDAP_LIBDIR= $(top_builddir)/libraries LUTIL_LIBS = @LUTIL_LIBS@ LDIF_LIBS = @LDIF_LIBS@ LDBM_LIBS = @LDBM_LIBS@ LTHREAD_LIBS = @LTHREAD_LIBS@ -LDAP_LIBLBER_DEPEND = $(LDAP_LIBDIR)/liblber/liblber.la -LDAP_LIBLDAP_DEPEND = $(LDAP_LIBDIR)/libldap/libldap.la -LDAP_LIBLDIF_DEPEND = $(LDAP_LIBDIR)/libldif/libldif.a -LDAP_LIBLUTIL_DEPEND = $(LDAP_LIBDIR)/liblutil/liblutil.a - -LDAP_LIBAVL_DEPEND = $(LDAP_LIBDIR)/libavl/libavl.a -LDAP_LIBLDBM_DEPEND = $(LDAP_LIBDIR)/libldbm/libldbm.a -LDAP_LIBLTHREAD_DEPEND = $(LDAP_LIBDIR)/libldap_r/libldap_r.la - -LDAP_LIBDEPEND = $(LDAP_LIBLDAP_DEPEND) $(LDAP_LIBLBER_DEPEND) \ - $(LDAP_LIBLDIF_DEPEND) $(LDAP_LIBLUTIL_DEPEND) -SLAPD_LIBDEPEND = $(LDAP_LIBDEPEND) $(LDAP_LIBAVL_DEPEND) \ - $(LDAP_LIBLDBM_DEPEND) $(LDAP_LIBLTHREAD_DEPEND) +LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la +LDAP_LIBLDAP_LA = $(LDAP_LIBDIR)/libldap/libldap.la +LDAP_LIBLDAP_R_LA = $(LDAP_LIBDIR)/libldap_r/libldap_r.la + +LDAP_LIBAVL_A = $(LDAP_LIBDIR)/libavl/libavl.a +LDAP_LIBLDBM_A = $(LDAP_LIBDIR)/libldbm/libldbm.a +LDAP_LIBLDIF_A = $(LDAP_LIBDIR)/libldif/libldif.a +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_LIBLUTIL_A) $(LDAP_LIBLDIF_A) \ + $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA) +SLURPD_L = $(LDAP_LIBLDIF_A) $(LDAP_LIBLUTIL_A) \ + $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) +SLAPD_L = $(LDAP_LIBAVL_A) $(LDAP_LIBLDBM_A) \ + $(LDAP_LIBLUNICODE_A) $(LDAP_LIBREWRITE_A) \ + $(SLURPD_L) WRAP_LIBS = @WRAP_LIBS@ # AutoConfig generated diff --git a/clients/finger/Makefile.in b/clients/finger/Makefile.in index 5a5d7fc3ea..ea9929f543 100644 --- a/clients/finger/Makefile.in +++ b/clients/finger/Makefile.in @@ -10,13 +10,13 @@ PROGRAMS = $(@PLAT@_PRGS) LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XLIBS = -lldap -llber -llutil +XLIBS = $(LDAP_L) XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) in.xfingerd : version.o $(LTLINK) -o $@ version.o $(OBJS) $(LIBS) -version.c: ${OBJS} ${LDAP_LIBDEPEND} +version.c: $(OBJS) $(XLIBS) @-$(RM) $@ $(MKVERSION) in.xfingerd > $@ diff --git a/clients/mail500/Makefile.in b/clients/mail500/Makefile.in index 260fefcae9..efd93bf525 100644 --- a/clients/mail500/Makefile.in +++ b/clients/mail500/Makefile.in @@ -10,13 +10,13 @@ OBJS= main.o LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XLIBS = -lldap -llber -llutil +XLIBS = $(LDAP_L) XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) mail500 : version.o $(LTLINK) -o $@ version.o $(OBJS) $(LIBS) -version.c: ${OBJS} $(LDAP_LIBDEPEND) +version.c: $(OBJS) $(XLIBS) @-$(RM) $@ $(MKVERSION) mail500 > $@ diff --git a/clients/maildap/Makefile.in b/clients/maildap/Makefile.in index 5bff81dd2f..5c81f577ea 100644 --- a/clients/maildap/Makefile.in +++ b/clients/maildap/Makefile.in @@ -10,13 +10,13 @@ OBJS= main.o LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XLIBS = -lldap -llber -llutil +XLIBS = $(LDAP_L) XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) maildap : version.o $(LTLINK) -o $@ version.o $(OBJS) $(LIBS) -version.c: ${OBJS} $(LDAP_LIBDEPEND) +version.c: $(OBJS) $(XLIBS) @-$(RM) $@ $(MKVERSION) maildap > $@ diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in index c120fd4c68..54e77fa8c6 100644 --- a/clients/tools/Makefile.in +++ b/clients/tools/Makefile.in @@ -10,7 +10,7 @@ OBJS = ldapsearch.o ldapmodify.o ldapdelete.o ldapmodrdn.o \ LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XLIBS = -llutil -lldif -lldap -llber +XLIBS = $(LDAP_LIBLDIF_A) $(LDAP_L) XXLIBS = $(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS) XSRCS = ldsversion.c ldmversion.c lddversion.c ldrversion.c \ @@ -46,31 +46,31 @@ ldapadd: ldapmodify $(LN_H) ldapmodify$(EXEEXT) ldapadd$(EXEEXT) -ldsversion.c: ldapsearch.o $(LDAP_LIBDEPEND) +ldsversion.c: ldapsearch.o $(XLIBS) @-$(RM) $@ $(MKVERSION) ldapsearch > $@ -ldmversion.c: ldapmodify.o $(LDAP_LIBDEPEND) +ldmversion.c: ldapmodify.o $(XLIBS) @-$(RM) $@ $(MKVERSION) ldapmodify > $@ -lddversion.c: ldapdelete.o $(LDAP_LIBDEPEND) +lddversion.c: ldapdelete.o $(XLIBS) @-$(RM) $@ $(MKVERSION) ldapdelete > $@ -ldpversion.c: ldappasswd.o $(LDAP_LIBDEPEND) +ldpversion.c: ldappasswd.o $(XLIBS) @-$(RM) $@ $(MKVERSION) ldappasswd > $@ -ldrversion.c: ldapmodrdn.o $(LDAP_LIBDEPEND) +ldrversion.c: ldapmodrdn.o $(XLIBS) @-$(RM) $@ $(MKVERSION) ldapmodrdn > $@ -ldwversion.c: ldapwhoami.o $(LDAP_LIBDEPEND) +ldwversion.c: ldapwhoami.o $(XLIBS) @-$(RM) $@ $(MKVERSION) ldapwhoami > $@ -ldcversion.c: ldapcompare.o $(LDAP_LIBDEPEND) +ldcversion.c: ldapcompare.o $(XLIBS) @-$(RM) $@ $(MKVERSION) ldapcompare > $@ diff --git a/clients/ud/Makefile.in b/clients/ud/Makefile.in index fcf82469de..c06a62b8d3 100644 --- a/clients/ud/Makefile.in +++ b/clients/ud/Makefile.in @@ -13,13 +13,13 @@ PROGRAMS = $(@PLAT@_PRGS) LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XLIBS = -llutil -lldif -lldap -llber +XLIBS = $(LDAP_L) XXLIBS = $(TERMCAP_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS) ud : version.o $(LTLINK) -o $@ version.o $(OBJS) $(LIBS) -version.c: ${OBJS} $(LDAP_LIBDEPEND) +version.c: ${OBJS} $(XLIBS) @-$(RM) $@ $(MKVERSION) -s -c -n Version UserDirectory > $@ diff --git a/include/portable.h.in b/include/portable.h.in index b8e8e37ac2..9fa7ad4f57 100644 --- a/include/portable.h.in +++ b/include/portable.h.in @@ -350,9 +350,6 @@ /* Define if you have the header file. */ #undef HAVE_DIRENT_H -/* Define if you have the header file. */ -#undef HAVE_DLFCN_H - /* Define if you have the header file. */ #undef HAVE_ERRNO_H diff --git a/libraries/libavl/Makefile.in b/libraries/libavl/Makefile.in index 97d94927fd..6551c8a022 100644 --- a/libraries/libavl/Makefile.in +++ b/libraries/libavl/Makefile.in @@ -14,7 +14,7 @@ LDAP_LIBDIR= ../../libraries LIBRARY = libavl.a PROGRAMS = testavl -XLIBS = -lavl -llber +XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) -testavl: $(LIBRARY) testavl.o +testavl: $(XLIBS) testavl.o $(LTLINK) -o $@ testavl.o $(LIBS) diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in index a5764cf789..4687775b07 100644 --- a/libraries/liblber/Makefile.in +++ b/libraries/liblber/Makefile.in @@ -6,7 +6,6 @@ ## LIBRARY = liblber.la -XLIBRARY = ../liblber.a NT_SRCS = nt_err.c NT_OBJS = nt_err.lo @@ -24,15 +23,15 @@ PROGRAMS= dtest etest idtest LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XLIBS = -llber +XLIBS = $(LIBRARY) XXLIBS = NT_LINK_LIBS = $(AC_LIBS) -dtest: $(LIBRARY) dtest.o +dtest: $(XLIBS) dtest.o $(LTLINK) -o $@ dtest.o $(LIBS) -etest: $(LIBRARY) etest.o +etest: $(XLIBS) etest.o $(LTLINK) -o $@ etest.o $(LIBS) -idtest: $(LIBRARY) idtest.o +idtest: $(XLIBS) idtest.o $(LTLINK) -o $@ idtest.o $(LIBS) install-local: FORCE diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in index 20feba9471..df89183eb2 100644 --- a/libraries/libldap/Makefile.in +++ b/libraries/libldap/Makefile.in @@ -5,7 +5,6 @@ ## Makefile.in for LDAP -lldap ## LIBRARY = libldap.la -XLIBRARY = ../libldap.a PROGRAMS = apitest dntest ftest ltest @@ -33,17 +32,17 @@ LDAP_LIBDIR= ../../libraries LIB_DEFS = -DLDAP_LIBRARY -XLIBS = -lldap -llber -llutil +XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A) XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) NT_LINK_LIBS = -llber $(AC_LIBS) $(SECURITY_LIBS) -apitest: $(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND) +apitest: $(XLIBS) apitest.o $(LTLINK) -o $@ apitest.o $(LIBS) -dntest: $(LIBRARY) dntest.o $(LDAP_LIBLBER_DEPEND) +dntest: $(XLIBS) dntest.o $(LTLINK) -o $@ dntest.o $(LIBS) -ftest: $(LIBRARY) ftest.o $(LDAP_LIBLBER_DEPEND) +ftest: $(XLIBS) ftest.o $(LTLINK) -o $@ ftest.o $(LIBS) -ltest: $(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND) +ltest: $(XLIBS) test.o $(LTLINK) -o $@ test.o $(LIBS) CFFILES=ldap.conf ldapfilter.conf diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in index 87778cbde2..98b567860b 100644 --- a/libraries/libldap_r/Makefile.in +++ b/libraries/libldap_r/Makefile.in @@ -5,7 +5,6 @@ ## Makefile.in for LDAP -lldap ## LIBRARY = libldap_r.la -XLIBRARY = ../libldap_r.a PROGRAMS = apitest ltest @@ -41,10 +40,10 @@ LDAP_LIBDIR= ../../libraries LIB_DEFS = -DLDAP_LIBRARY XDEFS = -DLDAP_R_COMPILE -I$(XXDIR) -XLIBS = -lldap_r -llber -llutil +XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A) XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) XXXLIBS = $(LTHREAD_LIBS) -NT_LINK_LIBS = -llber $(AC_LIBS) $(SECURITY_LIBS) +NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) .links : Makefile @for i in $(XXSRCS); do \ @@ -60,9 +59,9 @@ clean-local: FORCE depend-common: .links -apitest: $(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND) +apitest: $(XLIBS) apitest.o $(LTLINK) -o $@ apitest.o $(LIBS) -ltest: $(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND) +ltest: $(XLIBS) test.o $(LTLINK) -o $@ test.o $(LIBS) install-local: $(CFFILES) FORCE diff --git a/libraries/libldbm/Makefile.in b/libraries/libldbm/Makefile.in index 052a3da0d1..da07329ccd 100644 --- a/libraries/libldbm/Makefile.in +++ b/libraries/libldbm/Makefile.in @@ -12,6 +12,6 @@ OBJS = ldbm.o LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XLIBS = -lldbm -lavl +XLIBS = $(LIBRARY) XXLIBS = $(LDBM_LIBS) diff --git a/libraries/liblunicode/Makefile.in b/libraries/liblunicode/Makefile.in index 13d3bd7d5a..a243aac306 100644 --- a/libraries/liblunicode/Makefile.in +++ b/libraries/liblunicode/Makefile.in @@ -13,13 +13,13 @@ XXSRCS = ucdata.c ucgendat.c ure.c urestubs.c SRCS = ucstr.c OBJS = ucdata.o ure.o urestubs.o ucstr.o -XLIB = -llunicode +XLIB = $(LIBRARY) PROGRAMS = ucgendat LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -ucgendat: $(LIBRARY) ucgendat.o +ucgendat: $(XLIBS) ucgendat.o $(LTLINK) -o $@ ucgendat.o $(LIBS) ./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt diff --git a/libraries/librewrite/Makefile.in b/libraries/librewrite/Makefile.in index 20e89de8aa..1f1edd8064 100644 --- a/libraries/librewrite/Makefile.in +++ b/libraries/librewrite/Makefile.in @@ -19,9 +19,10 @@ LDAP_LIBDIR= ../../libraries LIBRARY = librewrite.a PROGRAMS = rewrite -XLIBS = -lrewrite -lavl -llutil -lldap_r -llber +XLIBS = $(LIBRARY) $(LDAP_LIBAVL_A) $(LDAP_LIBLUTIL_A) \ + $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) XXLIBS = $(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS) XXXLIBS = $(LTHREAD_LIBS) -rewrite: $(LIBRARY) rewrite.o parse.o +rewrite: $(XLIBS) rewrite.o parse.o $(LTLINK) -o $@ rewrite.o parse.o $(LIBS) diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index f977e9c1e6..2d77b635ee 100644 --- a/servers/slapd/Makefile.in +++ b/servers/slapd/Makefile.in @@ -46,8 +46,7 @@ SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BACKENDS@ XDEFS = $(MODULES_CPPFLAGS) XLDFLAGS = $(MODULES_LDFLAGS) $(SLAPD_MODULES) -# $(LTHREAD_LIBS) must be last -XLIBS = libbackends.a -lavl @LDBM_LIB@ -lldif -llutil -llunicode -lldap_r -llber +XLIBS = libbackends.a $(SLAPD_L) XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS) XXXLIBS = $(LTHREAD_LIBS) $(MODULES_LIBS) @@ -59,7 +58,7 @@ all-local-srv: all-cffiles NT_SLAPD_DEPENDS = slapd.exp NT_SLAPD_OBJECTS = slapd.exp symdummy.o $(OBJS) version.o -UNIX_SLAPD_DEPENDS = libbackends.a version.o +UNIX_SLAPD_DEPENDS = libbackends.a version.o $(SLAP_L) UNIX_SLAPD_OBJECTS = $(OBJS) version.o SLAPD_DEPENDS = $(@PLAT@_SLAPD_DEPENDS) diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in index e958476925..2377a39ca1 100644 --- a/servers/slapd/tools/Makefile.in +++ b/servers/slapd/tools/Makefile.in @@ -25,7 +25,7 @@ SLAPD_MODULES = @SLAPD_MODULES_LIST@ XDEFS = $(MODULES_CPPFLAGS) XLDFLAGS = $(MODULES_LDFLAGS) $(SLAPD_MODULES) -XLIBS = -lavl -lldif @LDBM_LIB@ -llutil -llunicode -lldap_r -llber +XLIBS = $(SLAPD_L) $(LDBM_LIBS) XXLIBS = $(SLAPD_LIBS) \ $(LDBM_LIBS) $(SECURITY_LIBS) \ $(LDIF_LIBS) $(LUTIL_LIBS) @@ -55,16 +55,16 @@ build-progs: $(PROGRAMS) # # SLAP Tools # -slapadd: slapadd.o ../libbackends.a $(SLAPOBJS) $(SLAPD_LIBDEPEND) +slapadd: slapadd.o ../libbackends.a $(SLAPOBJS) $(SLAPD_L) $(LTLINK) -o $@ slapadd.o $(SLAPOBJS) ../libbackends.a $(LIBS) -slapcat: slapcat.o ../libbackends.a $(SLAPOBJS) $(SLAPD_LIBDEPEND) +slapcat: slapcat.o ../libbackends.a $(SLAPOBJS) $(SLAPD_L) $(LTLINK) -o $@ slapcat.o $(SLAPOBJS) ../libbackends.a $(LIBS) -slapindex: slapindex.o ../libbackends.a $(SLAPOBJS) $(SLAPD_LIBDEPEND) +slapindex: slapindex.o ../libbackends.a $(SLAPOBJS) $(SLAPD_L) $(LTLINK) -o $@ slapindex.o $(SLAPOBJS) ../libbackends.a $(LIBS) -slappasswd: slappasswd.o $(SLAPD_LIBDEPEND) +slappasswd: slappasswd.o $(SLAPD_L) $(LTLINK) -o $@ slappasswd.o $(LIBS) clean-local: FORCE diff --git a/servers/slurpd/Makefile.in b/servers/slurpd/Makefile.in index 03025a62d3..30de82886c 100644 --- a/servers/slurpd/Makefile.in +++ b/servers/slurpd/Makefile.in @@ -28,7 +28,7 @@ BUILD_SRV = @BUILD_SLURPD@ all-local-srv: $(PROGRAMS) # $(LTHREAD_LIBS) must be last! -XLIBS = -lldif -lldap_r -llber -llutil +XLIBS = $(SLURPD_L) XXLIBS = $(SLURPD_LIBS) $(SECURITY_LIBS) \ $(LDIF_LIBS) $(LUTIL_LIBS) XXXLIBS = $(LTHREAD_LIBS) @@ -39,7 +39,7 @@ slurpd: version.o sslurpd: version.o $(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS) -version.c: $(OBJS) $(LDAP_LIBDEPEND) $(LDAP_LIBTHREAD_DEPEND) +version.c: $(OBJS) $(SLURPD_L) @-$(RM) $@ $(MKVERSION) slurpd > $@ diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in index 97cdcb64b8..58ee142a0f 100644 --- a/tests/progs/Makefile.in +++ b/tests/progs/Makefile.in @@ -12,7 +12,7 @@ SRCS = slapd-tester.c slapd-search.c slapd-read.c slapd-addel.c LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XLIBS = -lldap -llber +XLIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA) XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) # build-tools: FORCE @@ -20,16 +20,16 @@ XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) # load-tools: $(PROGRAMS) -slapd-tester: slapd-tester.o +slapd-tester: slapd-tester.o $(XLIBS) $(LTLINK) -o $@ slapd-tester.o $(LIBS) -slapd-search: slapd-search.o $(LDAP_LIBLBER_DEPEND) $(LDAP_LIBLDAP_DEPEND) +slapd-search: slapd-search.o $(XLIBS) $(LTLINK) -o $@ slapd-search.o $(LIBS) -slapd-read: slapd-read.o $(LDAP_LIBLBER_DEPEND) $(LDAP_LIBLDAP_DEPEND) +slapd-read: slapd-read.o $(XLIBS) $(LTLINK) -o $@ slapd-read.o $(LIBS) -slapd-addel: slapd-addel.o $(LDAP_LIBLBER_DEPEND) $(LDAP_LIBLDAP_DEPEND) +slapd-addel: slapd-addel.o $(XLIBS) $(LTLINK) -o $@ slapd-addel.o $(LIBS) -- 2.39.5