X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FMakefile.in;h=71b364db69c3c8107aa0ef9de42f1c1cb9d05b98;hb=8141cd4db7ff32d8ed5dc60788a774ee9023b083;hp=f774b1322c26d2a17554a21b14312773c8a32d63;hpb=f07015dad2d6ccdbe5b8360bfbc601b13baae894;p=openldap diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index f774b1322c..71b364db69 100644 --- a/servers/slapd/Makefile.in +++ b/servers/slapd/Makefile.in @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2005 The OpenLDAP Foundation. +## Copyright 1998-2008 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -29,16 +29,16 @@ SRCS = main.c globals.c bconfig.c config.c daemon.c \ dn.c compare.c modify.c delete.c modrdn.c ch_malloc.c \ value.c ava.c bind.c unbind.c abandon.c filterentry.c \ phonetic.c acl.c str2filter.c aclparse.c init.c user.c \ - repl.c lock.c controls.c extended.c kerberos.c passwd.c \ + lock.c controls.c extended.c passwd.c \ schema.c schema_check.c schema_init.c schema_prep.c \ schemaparse.c ad.c at.c mr.c syntax.c oc.c saslauthz.c \ oidm.c starttls.c index.c sets.c referral.c root_dse.c \ sasl.c module.c mra.c mods.c sl_malloc.c zn_malloc.c limits.c \ operational.c matchedValues.c cancel.c syncrepl.c \ - backover.c ctxcsn.c ldapsync.c frontend.c \ + backglue.c backover.c ctxcsn.c ldapsync.c frontend.c \ slapadd.c slapcat.c slapcommon.c slapdn.c slapindex.c \ slappasswd.c slaptest.c slapauth.c slapacl.c component.c \ - aci.c \ + aci.c alock.c txn.c \ $(@PLAT@_SRCS) OBJS = main.o globals.o bconfig.o config.o daemon.o \ @@ -47,16 +47,16 @@ OBJS = main.o globals.o bconfig.o config.o daemon.o \ dn.o compare.o modify.o delete.o modrdn.o ch_malloc.o \ value.o ava.o bind.o unbind.o abandon.o filterentry.o \ phonetic.o acl.o str2filter.o aclparse.o init.o user.o \ - repl.o lock.o controls.o extended.o kerberos.o passwd.o \ + lock.o controls.o extended.o passwd.o \ schema.o schema_check.o schema_init.o schema_prep.o \ schemaparse.o ad.o at.o mr.o syntax.o oc.o saslauthz.o \ oidm.o starttls.o index.o sets.o referral.o root_dse.o \ sasl.o module.o mra.o mods.o sl_malloc.o zn_malloc.o limits.o \ operational.o matchedValues.o cancel.o syncrepl.o \ - backover.o ctxcsn.o ldapsync.o frontend.o \ + backglue.o backover.o ctxcsn.o ldapsync.o frontend.o \ slapadd.o slapcat.o slapcommon.o slapdn.o slapindex.o \ slappasswd.o slaptest.o slapauth.o slapacl.o component.o \ - aci.o \ + aci.o alock.o txn.o \ $(@PLAT@_OBJS) LDAP_INCDIR= ../../include -I$(srcdir) -I$(srcdir)/slapi -I. @@ -72,9 +72,9 @@ SLAPI_LIBS=@LIBSLAPI@ @SLAPI_LIBS@ XDEFS = $(MODULES_CPPFLAGS) XLDFLAGS = $(MODULES_LDFLAGS) -XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L) +XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L) $(MODULES_LIBS) XXLIBS = $(SLAPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS) -XXXLIBS = $(LTHREAD_LIBS) $(SLAPI_LIBS) $(MODULES_LIBS) +XXXLIBS = $(LTHREAD_LIBS) $(SLAPI_LIBS) BUILD_OPT = "--enable-slapd" BUILD_SRV = @BUILD_SLAPD@ @@ -103,7 +103,7 @@ SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS) # we want to export EVERY global symbol that it knows about (NOT including # symbols that are imported from other DLLs). The set of symbols to # export INCLUDES symbols from all static libraries that slapd gets -# linked with, e.g. avl, ldbm, lunicode, lutil, etc. This list +# linked with, e.g. avl, lunicode, lutil, etc. This list # will also include liblber and libldap_r if they were built as static # libraries. ALSO included will be symbols from other STATIC libraries # outside the domain of the OpenLDAP source tree, e.g. regex, ltdl, @@ -138,7 +138,7 @@ SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS) # for functions, but it is required for variables. # # The symdummy.c file basically references EVERY symbol available to slapd.exe, -# including symbols that slapd.exe never actually refereneced. The file +# including symbols that slapd.exe never actually referenced. The file # is compiled and included at link time. Without this object file, slapd.exe # would NOT export symbols that it never referenced. The reason that these # symbols must still be exported is because a dynamic module may want to @@ -155,7 +155,7 @@ SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS) # on its own very long list of dependencies. # slapd.def: libbackends.a liboverlays.a version.o - @for i in $(LDFLAGS) ; do \ + @for i in XX $(LDFLAGS) ; do \ path=`expr "$$i" : "-L\(.*\)"`; \ if test $$? != 0; then continue; fi; \ paths="$$paths $$path"; \ @@ -167,8 +167,8 @@ slapd.def: libbackends.a liboverlays.a version.o -l*) \ done="" ;\ base=`expr "$$i" : "-l\(.*\)"`; \ - for p in $$paths ; do \ - for ext in la dll a ; do \ + for p in . $$paths ; do \ + for ext in la dll dll.a a ; do \ path=$$p/lib$$base.$$ext; \ test ! -f $$path && continue; \ if test $$ext = la ; then \ @@ -192,12 +192,14 @@ slapd.def: libbackends.a liboverlays.a version.o test -z "$$obj" && continue; \ ;; \ *.la) \ - if test -n "$LTSTATIC"; then \ + if test -n "$(LTSTATIC)"; then \ base=`expr "$$i" : ".*/\(.*\).la"`; \ path=`expr "$$i" : "\(.*/\).*"`; \ obj=$$path.libs/$$base.a; \ fi; \ ;; \ + *.dll.a) \ + ;; \ *.o | *.a) \ obj=$$i; \ esac; \ @@ -335,7 +337,7 @@ backends.o: backends.c $(srcdir)/slap.h depend-local-srv: FORCE @for i in $(SUBDIRS); do \ - if test -d $$i -a -f $$i/Makefile ; then \ + if test -d $$i && test -f $$i/Makefile ; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) depend"; \ ( cd $$i; $(MAKE) $(MFLAGS) depend ); \ if test $$? != 0 ; then exit 1; fi ; \ @@ -351,7 +353,7 @@ veryclean-local: clean-local-srv: FORCE @for i in $(SUBDIRS); do \ - if test -d $$i -a -f $$i/Makefile ; then \ + if test -d $$i && test -f $$i/Makefile ; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) clean"; \ ( cd $$i; $(MAKE) $(MFLAGS) clean ); \ if test $$? != 0 ; then exit 1; fi ; \ @@ -361,7 +363,7 @@ clean-local-srv: FORCE veryclean-local-srv: FORCE @for i in $(SUBDIRS); do \ - if test -d $$i -a -f $$i/Makefile ; then \ + if test -d $$i && test -f $$i/Makefile ; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) clean"; \ ( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \ fi; \ @@ -376,7 +378,7 @@ install-slapd: FORCE $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \ slapd$(EXEEXT) $(DESTDIR)$(libexecdir) @for i in $(SUBDIRS); do \ - if test -d $$i -a -f $$i/Makefile ; then \ + if test -d $$i && test -f $$i/Makefile ; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \ ( cd $$i; $(MAKE) $(MFLAGS) install ); \ if test $$? != 0 ; then exit 1; fi ; \