declare oc_bvfind_undef()

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 6a503c3f6d1875a3282d08a6b6556a22cbbea7e5..5bea09f84f442cdc1b21122b422ba47aed85984c 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -13,11 +13,12 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-PROGRAMS=slapd
+SLAPTOOLS=slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl
+PROGRAMS=slapd $(SLAPTOOLS)
 XPROGRAMS=sslapd libbackends.a .backend liboverlays.a
 XSRCS=version.c
 
-SUBDIRS=back-* shell-backends slapi overlays tools
+SUBDIRS=back-* shell-backends slapi overlays
 
 NT_SRCS = nt_svc.c
 NT_OBJS = nt_svc.o ../../libraries/liblutil/slapdmsg.res
@@ -33,8 +34,11 @@ SRCS = main.c globals.c config.c daemon.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 limits.c \
-               backglue.c operational.c matchedValues.c cancel.c syncrepl.c \
-               backover.c ctxcsn.c ldapsync.c sessionlog.c $(@PLAT@_SRCS)
+               operational.c matchedValues.c cancel.c syncrepl.c \
+               backover.c ctxcsn.c ldapsync.c sessionlog.c frontend.c \
+               slapadd.c slapcat.c slapcommon.c slapdn.c slapindex.c \
+               slappasswd.c slaptest.c slapauth.c slapacl.c component.c \
+               $(@PLAT@_SRCS)
 
 OBJS   = main.o globals.o config.o daemon.o \
                connection.o search.o filter.o add.o cr.o \
@@ -47,14 +51,17 @@ OBJS        = main.o globals.o config.o daemon.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 limits.o \
-               backglue.o operational.o matchedValues.o cancel.o syncrepl.o \
-               backover.o ctxcsn.o ldapsync.o sessionlog.o $(@PLAT@_OBJS)
+               operational.o matchedValues.o cancel.o syncrepl.o \
+               backover.o ctxcsn.o ldapsync.o sessionlog.o frontend.o \
+               slapadd.o slapcat.o slapcommon.o slapdn.o slapindex.o \
+               slappasswd.o slaptest.o slapauth.o slapacl.o component.o \
+               $(@PLAT@_OBJS)
 
-LDAP_INCDIR= ../../include -I$(srcdir)/slapi
+LDAP_INCDIR= ../../include -I$(srcdir)/slapi -I.
 LDAP_LIBDIR= ../../libraries
 
 SLAP_DIR=
-SLAPD_STATIC_DEPENDS=@SLAPD_NO_STATIC@ libbackends.a liboverlays.a
+SLAPD_STATIC_DEPENDS=@SLAPD_NO_STATIC@ libbackends.a
 SLAPD_STATIC_BACKENDS=@SLAPD_STATIC_BACKENDS@
 SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BACKENDS@
 
@@ -63,8 +70,8 @@ SLAPI_LIBS=@LIBSLAPI@ @SLAPI_LIBS@
 XDEFS = $(MODULES_CPPFLAGS)
 XLDFLAGS = $(MODULES_LDFLAGS)
 
-XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L)
-XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
+XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L) liboverlays.a
+XXLIBS = $(SLAPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS) $(SLAPI_LIBS) $(MODULES_LIBS)
 
 BUILD_OPT = "--enable-slapd"
@@ -78,7 +85,7 @@ NT_SLAPD_OBJECTS = slapd.exp symdummy.o $(OBJS) version.o
 UNIX_SLAPD_DEPENDS = $(SLAPD_STATIC_DEPENDS) version.o $(SLAPD_L)
 UNIX_SLAPD_OBJECTS = $(OBJS) version.o
 
-SLAPD_DEPENDS = $(@PLAT@_SLAPD_DEPENDS)
+SLAPD_DEPENDS = liboverlays.a $(@PLAT@_SLAPD_DEPENDS)
 SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS)
 
 # Notes about slapd for Windows
@@ -250,11 +257,15 @@ libslapi.a: slapi/.libs/libslapi.a
 slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
        $(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \
                $(WRAP_LIBS)
+       $(RM) $(SLAPTOOLS)
+       for i in $(SLAPTOOLS); do \
+               $(LN_S) slapd$(EXEEXT) $$i$(EXEEXT); done
+
 
 sslapd: version.o
        $(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS) $(WRAP_LIBS)
 
-tools $(SLAPD_DYNAMIC_BACKENDS): slapd
+dummy $(SLAPD_DYNAMIC_BACKENDS): slapd
        cd $@; $(MAKE) $(MFLAGS) all
        @touch $@
 
@@ -319,7 +330,7 @@ depend-local-srv: FORCE
        @echo ""
 
 clean-local:
-       rm -f *.exp *.def *.base *.a *.objs symdummy.c
+       $(RM) *.exp *.def *.base *.a *.objs symdummy.c
 
 clean-local-srv: FORCE
        @for i in $(SUBDIRS); do \
@@ -329,7 +340,7 @@ clean-local-srv: FORCE
                        if test $$? != 0 ; then exit 1; fi ; \
                fi; \
        done
-       rm -f *.tmp all-cffiles
+       $(RM) *.tmp all-cffiles
 
 veryclean-local-srv: FORCE
        @for i in $(SUBDIRS); do \
@@ -339,7 +350,8 @@ veryclean-local-srv: FORCE
                fi; \
        done
 
-install-local-srv: install-slapd install-conf install-schema install-tools
+install-local-srv: install-slapd install-tools \
+       install-conf install-db-config install-schema install-tools
 
 install-slapd: FORCE
        -$(MKDIR) $(DESTDIR)$(libexecdir)
@@ -354,7 +366,7 @@ install-slapd: FORCE
            fi; \
        done
 
-all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS) tools
+all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS)
        @if test $(PLAT) = NT; then \
            sysconfdir=`cygpath -w $(sysconfdir) | \
                $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
@@ -395,7 +407,6 @@ install-schema: FORCE
 
 install-conf: FORCE
        @-$(MKDIR) $(DESTDIR)$(sysconfdir)
-       @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
        $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf.default
        if test ! -f $(DESTDIR)$(sysconfdir)/slapd.conf; then \
                echo "installing slapd.conf in $(sysconfdir)"; \
@@ -405,7 +416,18 @@ install-conf: FORCE
                echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/slapd.conf" ; \
        fi
 
+install-db-config: FORCE
+       @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
+       @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
+       $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
+               $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
+       $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
+               $(DESTDIR)$(sysconfdir)/DB_CONFIG.example
+
 install-tools: FORCE
-       @-$(MKDIR) $(DESTDIR)$(sbindir)
-       (cd tools; $(MAKE) $(MFLAGS) install)
+       -$(MKDIR) $(DESTDIR)$(sbindir)
+       for i in $(SLAPTOOLS); do \
+               $(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
+               $(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
+       done