X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FMakefile.in;h=00ce0e515f253ee34c523d5f4e40c27691f519e9;hb=0cc7ed6d550418bb0d936a557e3b9f119ba54a44;hp=8c5ed6218942206882390965d91b8830b923001f;hpb=c8f3bbf9e5a21b1a043d9f65d15e1b3b8358471b;p=openldap diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index 8c5ed62189..00ce0e515f 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-2006 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ SUBDIRS=back-* shell-backends slapi overlays NT_SRCS = nt_svc.c NT_OBJS = nt_svc.o ../../libraries/liblutil/slapdmsg.res -SRCS = main.c globals.c config.c daemon.c \ +SRCS = main.c globals.c bconfig.c config.c daemon.c \ connection.c search.c filter.c add.c cr.c \ attr.c entry.c backend.c result.c operation.c \ dn.c compare.c modify.c delete.c modrdn.c ch_malloc.c \ @@ -35,14 +35,15 @@ SRCS = main.c globals.c config.c daemon.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 alock.c \ $(@PLAT@_SRCS) -OBJS = main.o globals.o config.o daemon.o \ +OBJS = main.o globals.o bconfig.o config.o daemon.o \ connection.o search.o filter.o add.o cr.o \ - attr.o entry.o backend.o result.o operation.o \ + attr.o entry.o backend.o backends.o result.o operation.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 \ @@ -52,16 +53,17 @@ OBJS = main.o globals.o config.o daemon.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 alock.o \ $(@PLAT@_OBJS) LDAP_INCDIR= ../../include -I$(srcdir) -I$(srcdir)/slapi -I. LDAP_LIBDIR= ../../libraries SLAP_DIR= -SLAPD_STATIC_DEPENDS=@SLAPD_NO_STATIC@ libbackends.a +SLAPD_STATIC_DEPENDS=@SLAPD_NO_STATIC@ libbackends.a liboverlays.a SLAPD_STATIC_BACKENDS=@SLAPD_STATIC_BACKENDS@ SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BACKENDS@ @@ -70,7 +72,7 @@ SLAPI_LIBS=@LIBSLAPI@ @SLAPI_LIBS@ XDEFS = $(MODULES_CPPFLAGS) XLDFLAGS = $(MODULES_LDFLAGS) -XLIBS = $(SLAPD_STATIC_DEPENDS) liboverlays.a $(SLAPD_L) +XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L) XXLIBS = $(SLAPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS) XXXLIBS = $(LTHREAD_LIBS) $(SLAPI_LIBS) $(MODULES_LIBS) @@ -80,12 +82,12 @@ BUILD_SRV = @BUILD_SLAPD@ all-local-srv: all-cffiles NT_SLAPD_DEPENDS = slapd.exp -NT_SLAPD_OBJECTS = slapd.exp symdummy.o $(OBJS) backends.o version.o +NT_SLAPD_OBJECTS = slapd.exp symdummy.o $(OBJS) version.o -UNIX_SLAPD_DEPENDS = $(SLAPD_STATIC_DEPENDS) backends.o version.o $(SLAPD_L) -UNIX_SLAPD_OBJECTS = $(OBJS) backends.o version.o +UNIX_SLAPD_DEPENDS = $(SLAPD_STATIC_DEPENDS) version.o $(SLAPD_L) +UNIX_SLAPD_OBJECTS = $(OBJS) version.o -SLAPD_DEPENDS = liboverlays.a $(@PLAT@_SLAPD_DEPENDS) +SLAPD_DEPENDS = $(@PLAT@_SLAPD_DEPENDS) SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS) # Notes about slapd for Windows @@ -166,7 +168,7 @@ slapd.def: libbackends.a liboverlays.a version.o done="" ;\ base=`expr "$$i" : "-l\(.*\)"`; \ for p in $$paths ; do \ - for ext in la dll a ; do \ + for ext in la dll dll.a a ; do \ path=$$p/lib$$base.$$ext; \ test ! -f $$path && continue; \ if test $$ext = la ; then \ @@ -189,6 +191,15 @@ slapd.def: libbackends.a liboverlays.a version.o done; \ test -z "$$obj" && continue; \ ;; \ + *.la) \ + 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; \ @@ -262,13 +273,16 @@ slapd: $(SLAPD_DEPENDS) @LIBSLAPI@ $(LN_S) slapd$(EXEEXT) $$i$(EXEEXT); done -sslapd: version.o backends.o - $(LTLINK) -static -o $@ $(OBJS) version.o backends.o $(LIBS) $(WRAP_LIBS) +sslapd: version.o + $(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS) $(WRAP_LIBS) dummy $(SLAPD_DYNAMIC_BACKENDS): slapd cd $@; $(MAKE) $(MFLAGS) all @touch $@ +dynamic_overlays: slapd + cd overlays; $(MAKE) $(MFLAGS) dynamic + # # In Windows, dynamic backends have to be built after slapd. For this # reason, we only build static backends now and dynamic backends later. @@ -311,7 +325,7 @@ libbackends.a: .backend @ls -l libbackends.a; echo "" liboverlays.a: FORCE - @cd overlays; $(MAKE) $(MFLAGS) all + cd overlays; $(MAKE) $(MFLAGS) static version.c: Makefile @-$(RM) $@ @@ -323,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 ; \ @@ -339,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 ; \ @@ -349,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; \ @@ -361,17 +375,17 @@ install-local-srv: install-slapd install-tools \ install-slapd: FORCE -$(MKDIR) $(DESTDIR)$(libexecdir) -$(MKDIR) $(DESTDIR)$(localstatedir)/run - $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \ + $(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 ; \ fi; \ done -all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS) +all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS) dynamic_overlays @if test $(PLAT) = NT; then \ sysconfdir=`cygpath -w $(sysconfdir) | \ $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \ @@ -391,23 +405,16 @@ all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS) touch all-cffiles install-schema: FORCE - @-$(MKDIR) $(DESTDIR)$(schemadir) - i="$(srcdir)/schema/README" ; \ - SF=`basename $$i` ; \ - SD="$(DESTDIR)$(schemadir)/$$SF" ; \ - echo $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD ; \ - $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD - for i in $(srcdir)/schema/*.schema ; do \ - SF=`basename $$i` ; \ - SD="$(DESTDIR)$(schemadir)/$$SF" ; \ - if test ! -f $$SD ; then \ - echo "installing $$SF in $(schemadir)" ; \ - echo $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD ; \ - $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD ; \ - else \ - echo "PRESERVING EXISTING SCHEMA FILE $$SD" ; \ - fi ; \ - $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD.default ; \ + @if test -d $(DESTDIR)$(schemadir) ; then \ + echo "MOVING EXISTING SCHEMA DIR to $(DESTDIR)$(schemadir).$$$$" ; \ + mv $(DESTDIR)$(schemadir) $(DESTDIR)$(schemadir).$$$$ ; \ + fi + $(MKDIR) $(DESTDIR)$(schemadir) + @SD=$(DESTDIR)$(schemadir) ; \ + files=`cd $(srcdir)/schema ; echo README *.ldif *.schema` ; \ + for i in $$files ; do \ + echo $(INSTALL) $(INSTALLFLAGS) -m 444 schema/$$i $$SD/$$i ; \ + $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i ; \ done install-conf: FORCE