X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FMakefile.in;h=8266bcb5c103ae3e10b86911e25310528576bcd1;hb=280fc819cf9e8b05efa4df875291af0f20666d40;hp=4bc2c7314241f495a271a496f06d05e9f0260748;hpb=1b70e1644888c477890722e45307fea60eaa3d77;p=openldap

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 4bc2c73142..8266bcb5c1 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -9,8 +9,9 @@ XSRCS=version.c
 NT_SRCS = nt_svc.c
 NT_OBJS = nt_svc.o ../../libraries/liblutil/slapdmsg.res
 
-SRCS	= main.c daemon.c connection.c search.c filter.c add.c cr.c \
-		attr.c entry.c config.c backend.c result.c operation.c \
+SRCS	= main.c globals.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 \
 		value.c ava.c bind.c unbind.c abandon.c filterentry.c \
 		phonetic.c acl.c str2filter.c aclparse.c init.c user.c \
@@ -18,12 +19,13 @@ SRCS	= main.c daemon.c connection.c search.c filter.c add.c cr.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 suffixalias.c mra.c mods.c \
-		limits.c backglue.c operational.c matchedValues.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 \
 		$(@PLAT@_SRCS)
 
-OBJS	= main.o daemon.o connection.o search.o filter.o add.o cr.o \
-		attr.o entry.o config.o backend.o result.o operation.o \
+OBJS	= main.o globals.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 \
 		value.o ava.o bind.o unbind.o abandon.o filterentry.o \
 		phonetic.o acl.o str2filter.o aclparse.o init.o user.o \
@@ -31,15 +33,15 @@ OBJS	= main.o daemon.o connection.o search.o filter.o add.o cr.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 suffixalias.o mra.o mods.o \
-		limits.o backglue.o operational.o matchedValues.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 \
 		$(@PLAT@_OBJS)
 
-LDAP_INCDIR= ../../include -Islapi
+LDAP_INCDIR= ../../include -I$(srcdir)/slapi
 LDAP_LIBDIR= ../../libraries
 
 SLAP_DIR=
-SLAPD_STATIC_DEPENDS=@SLAPD_SLAPI_DEPEND@ @SLAPD_NO_STATIC@ libbackends.a
+SLAPD_STATIC_DEPENDS=@SLAPD_NO_STATIC@ libbackends.a
 SLAPD_STATIC_BACKENDS=@SLAPD_STATIC_BACKENDS@
 SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BACKENDS@
 
@@ -48,7 +50,7 @@ XLDFLAGS = $(MODULES_LDFLAGS)
 
 XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L)
 XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)
-XXXLIBS = $(LTHREAD_LIBS) $(MODULES_LIBS) $(SLAPI_LIBS)
+XXXLIBS = $(LTHREAD_LIBS) $(SLAPI_LIBS) @LIBSLAPI@ $(MODULES_LIBS)
 
 BUILD_OPT = "--enable-slapd"
 BUILD_SRV = @BUILD_SLAPD@
@@ -224,16 +226,16 @@ slapd.exp: libslapd.a
 	dlltool --dllname slapd.exe --input-def slapd.def \
 		--base-file slapd.base --output-exp $@
 
-.slapi: FORCE
+libslapi.a: .slapi
 	(cd slapi; $(MAKE) $(MFLAGS) all)
+	cp slapi/.libs/libslapi.a .
 
-libslapi.a: .slapi
+.slapi: $(SLAPD_OBJECTS)
 	$(AR) ruv slapi/libtmpslapd.a $(OBJS)
-	cp slapi/.libs/libslapi.a .
+	(cd slapi; $(MAKE) $(MFLAGS) all)
 
-slapd: $(SLAPD_DEPENDS)
+slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
 	$(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \
-		libslapi.a slapi/libtmpslapd.a \
 		$(WRAP_LIBS)
 
 sslapd: version.o
@@ -284,10 +286,12 @@ libbackends.a: .backend
 	fi
 	@ls -l libbackends.a; echo ""
 
-version.c: $(OBJS) $(SLAPD_LIBDEPEND) 
+version.c: Makefile
 	@-$(RM) $@
 	$(MKVERSION) -s -n Versionstr slapd > $@
 
+version.o: version.c $(OBJS) $(SLAPD_LIBDEPEND) 
+
 depend-local-srv: FORCE
 	@for i in back-* shell-backends slapi tools; do \
 		if test -d $$i -a -f $$i/Makefile ; then \
@@ -355,6 +359,11 @@ all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS) tools
 
 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" ; \