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

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 9410b50b44..8266bcb5c1 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -9,47 +9,48 @@ 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 charray.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 \
 		repl.c lock.c controls.c extended.c kerberos.c passwd.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 \
-		configinfo.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 \
+		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 \
 		$(@PLAT@_SRCS)
 
-OBJS	= main.o daemon.o connection.o search.o filter.o add.o charray.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 \
 		repl.o lock.o controls.o extended.o kerberos.o passwd.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 \
-		configinfo.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 \
+		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 \
 		$(@PLAT@_OBJS)
 
-LDAP_INCDIR= ../../include
+LDAP_INCDIR= ../../include -I$(srcdir)/slapi
 LDAP_LIBDIR= ../../libraries
 
 SLAP_DIR=
-SLAPD_MODULES=@SLAPD_MODULES_LIST@
+SLAPD_STATIC_DEPENDS=@SLAPD_NO_STATIC@ libbackends.a
 SLAPD_STATIC_BACKENDS=@SLAPD_STATIC_BACKENDS@
 SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BACKENDS@
 
 XDEFS = $(MODULES_CPPFLAGS)
-XLDFLAGS = $(MODULES_LDFLAGS) $(SLAPD_MODULES)
+XLDFLAGS = $(MODULES_LDFLAGS)
 
-# $(LTHREAD_LIBS) must be last
-XLIBS = libbackends.a -lavl @LDBM_LIB@ -lldif -llutil -llunicode -lldap_r -llber
+XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L)
 XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)
-XXXLIBS = $(LTHREAD_LIBS) $(MODULES_LIBS)
+XXXLIBS = $(LTHREAD_LIBS) $(SLAPI_LIBS) @LIBSLAPI@ $(MODULES_LIBS)
 
 BUILD_OPT = "--enable-slapd"
 BUILD_SRV = @BUILD_SLAPD@
@@ -59,7 +60,7 @@ all-local-srv: all-cffiles
 NT_SLAPD_DEPENDS = slapd.exp
 NT_SLAPD_OBJECTS = slapd.exp symdummy.o $(OBJS) version.o
 
-UNIX_SLAPD_DEPENDS = libbackends.a version.o
+UNIX_SLAPD_DEPENDS = $(SLAPD_STATIC_DEPENDS) version.o $(SLAPD_L)
 UNIX_SLAPD_OBJECTS = $(OBJS) version.o
 
 SLAPD_DEPENDS = $(@PLAT@_SLAPD_DEPENDS)
@@ -137,9 +138,9 @@ slapd.def: libbackends.a version.o
 	done; \
 	objs=""; \
 	for i in $(OBJS) version.o $(LIBS) ; do \
+	    obj="" ; \
 	    case $$i in \
 		-l*) \
-		    obj="" ; \
 		    done="" ;\
 		    base=`expr "$$i" : "-l\(.*\)"`; \
 		    for p in $$paths ; do \
@@ -225,24 +226,25 @@ slapd.exp: libslapd.a
 	dlltool --dllname slapd.exe --input-def slapd.def \
 		--base-file slapd.base --output-exp $@
 
-slapd: $(SLAPD_DEPENDS)
-	$(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) $(WRAP_LIBS)
-	@if test -n "$(SLAPD_DYNAMIC_BACKENDS)"; then \
-	    echo "building dynamic backends..."; \
-	    for i in XX $(SLAPD_DYNAMIC_BACKENDS); do \
-	    	if test $$i != XX; then \
-		    echo " "; echo "  cd $$i; $(MAKE) $(MFLAGS) all"; \
-		    ( cd $$i; $(MAKE) $(MFLAGS) all ); \
-		    if test $$? != 0; then exit 1; fi; \
-		fi; \
-	    done; \
-	    echo " "; \
-	fi
-	cd tools; $(MAKE) $(MFLAGS) all
+libslapi.a: .slapi
+	(cd slapi; $(MAKE) $(MFLAGS) all)
+	cp slapi/.libs/libslapi.a .
+
+.slapi: $(SLAPD_OBJECTS)
+	$(AR) ruv slapi/libtmpslapd.a $(OBJS)
+	(cd slapi; $(MAKE) $(MFLAGS) all)
+
+slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
+	$(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \
+		$(WRAP_LIBS)
 
 sslapd: version.o
 	$(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS) $(WRAP_LIBS)
 
+tools $(SLAPD_DYNAMIC_BACKENDS): slapd
+	cd $@; $(MAKE) $(MFLAGS) all
+	@touch $@
+
 #
 # In Windows, dynamic backends have to be built after slapd. For this
 # reason, we only build static backends now and dynamic backends later.
@@ -284,12 +286,14 @@ 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 tools; do \
+	@for i in back-* shell-backends slapi tools; do \
 		if test -d $$i -a -f $$i/Makefile ; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
 			( cd $$i; $(MAKE) $(MFLAGS) depend ); \
@@ -302,7 +306,7 @@ clean-local:
 	rm -f *.exp *.def *.base *.a *.objs symdummy.c
 
 clean-local-srv: FORCE
-	@for i in back-* shell-backends tools; do \
+	@for i in back-* shell-backends slapi tools; do \
 		if test -d $$i -a -f $$i/Makefile ; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
 			( cd $$i; $(MAKE) $(MFLAGS) clean ); \
@@ -312,7 +316,7 @@ clean-local-srv: FORCE
 	rm -f *.tmp all-cffiles
 
 veryclean-local-srv: FORCE
-	@for i in back-* shell-backends tools; do \
+	@for i in back-* shell-backends slapi tools; do \
 		if test -d $$i -a -f $$i/Makefile ; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
 			( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \
@@ -326,7 +330,7 @@ install-slapd: FORCE
 	-$(MKDIR) $(DESTDIR)$(localstatedir)
 	$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
 		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
-	@for i in back-* shell-backends tools; do \
+	@for i in back-* shell-backends slapi tools; do \
 	    if test -d $$i -a -f $$i/Makefile ; then \
 		echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
 		( cd $$i; $(MAKE) $(MFLAGS) install ); \
@@ -334,7 +338,7 @@ install-slapd: FORCE
 	    fi; \
 	done
 
-all-cffiles: slapd
+all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS) tools
 	@if test $(PLAT) = NT; then \
 	    sysconfdir=`cygpath -w $(sysconfdir) | \
 		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
@@ -355,6 +359,11 @@ all-cffiles: slapd
 
 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" ; \
@@ -370,7 +379,7 @@ install-schema: FORCE
 
 install-conf: FORCE
 	@-$(MKDIR) $(DESTDIR)$(sysconfdir)
-	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-ldbm
+	@-$(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)"; \