Fix startup check

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 590cff0e546ca7b2132505855397f0f5797de96c..465e26f7056e4f4e4046895d3a917863700a6486 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2004 The OpenLDAP Foundation.
+## Copyright 1998-2005 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 \
@@ -33,14 +33,14 @@ SRCS        = main.c globals.c config.c daemon.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 limits.c \
-               backglue.c operational.c matchedValues.c cancel.c syncrepl.c \
-               backover.c ctxcsn.c ldapsync.c sessionlog.c frontend.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 \
                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 \
+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 \
                dn.o compare.o modify.o delete.o modrdn.o ch_malloc.o \
@@ -50,14 +50,14 @@ OBJS        = main.o globals.o config.o daemon.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 limits.o \
-               backglue.o operational.o matchedValues.o cancel.o syncrepl.o \
-               backover.o ctxcsn.o ldapsync.o sessionlog.o frontend.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 \
                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 -I.
+LDAP_INCDIR= ../../include -I$(srcdir) -I$(srcdir)/slapi -I.
 LDAP_LIBDIR= ../../libraries
 
 SLAP_DIR=
@@ -70,7 +70,7 @@ SLAPI_LIBS=@LIBSLAPI@ @SLAPI_LIBS@
 XDEFS = $(MODULES_CPPFLAGS)
 XLDFLAGS = $(MODULES_LDFLAGS)
 
-XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L) liboverlays.a
+XLIBS = $(SLAPD_STATIC_DEPENDS) liboverlays.a $(SLAPD_L)
 XXLIBS = $(SLAPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS) $(SLAPI_LIBS) $(MODULES_LIBS)
 
@@ -80,10 +80,10 @@ BUILD_SRV = @BUILD_SLAPD@
 all-local-srv: all-cffiles
 
 NT_SLAPD_DEPENDS = slapd.exp
-NT_SLAPD_OBJECTS = slapd.exp symdummy.o $(OBJS) version.o
+NT_SLAPD_OBJECTS = slapd.exp symdummy.o $(OBJS) backends.o version.o
 
-UNIX_SLAPD_DEPENDS = $(SLAPD_STATIC_DEPENDS) version.o $(SLAPD_L)
-UNIX_SLAPD_OBJECTS = $(OBJS) version.o
+UNIX_SLAPD_DEPENDS = $(SLAPD_STATIC_DEPENDS) backends.o version.o $(SLAPD_L)
+UNIX_SLAPD_OBJECTS = $(OBJS) backends.o version.o
 
 SLAPD_DEPENDS = liboverlays.a $(@PLAT@_SLAPD_DEPENDS)
 SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS)
@@ -262,10 +262,10 @@ slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
                $(LN_S) slapd$(EXEEXT) $$i$(EXEEXT); done
 
 
-sslapd: version.o
-       $(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS) $(WRAP_LIBS)
+sslapd: version.o backends.o
+       $(LTLINK) -static -o $@ $(OBJS) version.o backends.o $(LIBS) $(WRAP_LIBS)
 
-$(SLAPD_DYNAMIC_BACKENDS): slapd
+dummy $(SLAPD_DYNAMIC_BACKENDS): slapd
        cd $@; $(MAKE) $(MFLAGS) all
        @touch $@
 
@@ -319,6 +319,8 @@ version.c: Makefile
 
 version.o: version.c $(OBJS) $(SLAPD_LIBDEPEND) 
 
+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 \
@@ -332,6 +334,9 @@ depend-local-srv: FORCE
 clean-local:
        $(RM) *.exp *.def *.base *.a *.objs symdummy.c
 
+veryclean-local:
+       $(RM) backends.c
+
 clean-local-srv: FORCE
        @for i in $(SUBDIRS); do \
                if test -d $$i -a -f $$i/Makefile ; then \