X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FMakefile.in;h=465e26f7056e4f4e4046895d3a917863700a6486;hb=ae3f784d5b8b022fc8bb5ecd2e612d9b1cdd13ed;hp=a20266895a11e4264509668ce488d56752b24fcf;hpb=7dc0b02fc988278527ad606f0acb41c69cd8cf2a;p=openldap

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index a20266895a..465e26f705 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -16,14 +16,14 @@
 SLAPTOOLS=slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl
 PROGRAMS=slapd $(SLAPTOOLS)
 XPROGRAMS=sslapd libbackends.a .backend liboverlays.a
-XSRCS=version.c backends.c
+XSRCS=version.c
 
 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,12 +35,12 @@ 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 sessionlog.c frontend.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 \
@@ -52,12 +52,12 @@ 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 sessionlog.o frontend.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)
 
@@ -262,8 +262,8 @@ 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)
 
 dummy $(SLAPD_DYNAMIC_BACKENDS): slapd
 	cd $@; $(MAKE) $(MFLAGS) all
@@ -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 \