X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FMakefile.in;h=408126e0105dd641caec6449b5f95e99fd508487;hb=1bd26d5951cc929b0513d569186662650ce598d9;hp=644de6603b0e39ba47c6d369012efe44c4a93d15;hpb=57ba4cac66401c191279435b84e115ca6a446a53;p=openldap

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 644de6603b..408126e010 100644
--- 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
@@ -13,7 +13,7 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-SLAPTOOLS=slapadd slapcat slapindex slapppasswd
+SLAPTOOLS=slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl
 PROGRAMS=slapd $(SLAPTOOLS)
 XPROGRAMS=sslapd libbackends.a .backend liboverlays.a
 XSRCS=version.c
@@ -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,17 @@ 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 \
-		slapadd.c slapcat.c slapcommon.c slapindex.c slappasswd.c \
-		backover.c ctxcsn.c ldapsync.c sessionlog.c $(@PLAT@_SRCS)
-
-OBJS	= main.o globals.o config.o daemon.o \
+		sasl.c module.c mra.c mods.c sl_malloc.c zn_malloc.c limits.c \
+		operational.c matchedValues.c cancel.c syncrepl.c \
+		backglue.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 \
+		aci.c alock.c \
+		$(@PLAT@_SRCS)
+
+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 \
+		attr.o entry.o backend.o backends.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 \
@@ -48,16 +51,19 @@ 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 \
-		slapadd.o slapcat.o slapcommon.o slapindex.o slappasswd.o \
-		backover.o ctxcsn.o ldapsync.o sessionlog.o $(@PLAT@_OBJS)
-
-LDAP_INCDIR= ../../include -I$(srcdir)/slapi
+		sasl.o module.o mra.o mods.o sl_malloc.o zn_malloc.o limits.o \
+		operational.o matchedValues.o cancel.o syncrepl.o \
+		backglue.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 \
+		aci.o alock.o \
+		$(@PLAT@_OBJS)
+
+LDAP_INCDIR= ../../include -I$(srcdir) -I$(srcdir)/slapi -I.
 LDAP_LIBDIR= ../../libraries
 
 SLAP_DIR=
-SLAPD_STATIC_DEPENDS=@SLAPD_NO_STATIC@ libbackends.a
+SLAPD_STATIC_DEPENDS=@SLAPD_NO_STATIC@ libbackends.a liboverlays.a
 SLAPD_STATIC_BACKENDS=@SLAPD_STATIC_BACKENDS@
 SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BACKENDS@
 
@@ -66,8 +72,8 @@ SLAPI_LIBS=@LIBSLAPI@ @SLAPI_LIBS@
 XDEFS = $(MODULES_CPPFLAGS)
 XLDFLAGS = $(MODULES_LDFLAGS)
 
-XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L) liboverlays.a
-XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
+XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L)
+XXLIBS = $(SLAPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS) $(SLAPI_LIBS) $(MODULES_LIBS)
 
 BUILD_OPT = "--enable-slapd"
@@ -81,7 +87,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 = liboverlays.a $(@PLAT@_SLAPD_DEPENDS)
+SLAPD_DEPENDS = $(@PLAT@_SLAPD_DEPENDS)
 SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS)
 
 # Notes about slapd for Windows
@@ -162,7 +168,7 @@ slapd.def: libbackends.a liboverlays.a version.o
 		    done="" ;\
 		    base=`expr "$$i" : "-l\(.*\)"`; \
 		    for p in $$paths ; do \
-			for ext in la dll a ; do \
+			for ext in la dll dll.a a ; do \
 			    path=$$p/lib$$base.$$ext; \
 			    test ! -f $$path && continue; \
 			    if test $$ext = la ; then \
@@ -185,6 +191,15 @@ slapd.def: libbackends.a liboverlays.a version.o
 		    done; \
 		    test -z "$$obj" && continue; \
 		    ;; \
+		*.la) \
+		    if test -n "$(LTSTATIC)"; then \
+			    base=`expr "$$i" : ".*/\(.*\).la"`; \
+			    path=`expr "$$i" : "\(.*/\).*"`; \
+			    obj=$$path.libs/$$base.a; \
+		    fi; \
+		    ;; \
+		*.dll.a) \
+		    ;; \
 		*.o | *.a) \
 		    obj=$$i; \
 	    esac; \
@@ -253,14 +268,20 @@ libslapi.a: slapi/.libs/libslapi.a
 slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
 	$(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \
 		$(WRAP_LIBS)
-	rm -f $(SLAPTOOLS)
+	$(RM) $(SLAPTOOLS)
 	for i in $(SLAPTOOLS); do \
-		$(LN_S) slapd $$i; done
+		$(LN_S) slapd$(EXEEXT) $$i$(EXEEXT); done
 
 
 sslapd: version.o
 	$(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS) $(WRAP_LIBS)
 
+dummy $(SLAPD_DYNAMIC_BACKENDS): slapd
+	cd $@; $(MAKE) $(MFLAGS) all
+	@touch $@
+
+dynamic_overlays: slapd
+	cd overlays; $(MAKE) $(MFLAGS) dynamic
 
 #
 # In Windows, dynamic backends have to be built after slapd. For this
@@ -304,7 +325,7 @@ libbackends.a: .backend
 	@ls -l libbackends.a; echo ""
 
 liboverlays.a: FORCE
-	@cd overlays; $(MAKE) $(MFLAGS) all
+	cd overlays; $(MAKE) $(MFLAGS) static
 
 version.c: Makefile
 	@-$(RM) $@
@@ -312,9 +333,11 @@ 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 \
+		if test -d $$i && test -f $$i/Makefile ; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
 			( cd $$i; $(MAKE) $(MFLAGS) depend ); \
 			if test $$? != 0 ; then exit 1; fi ; \
@@ -323,42 +346,46 @@ depend-local-srv: FORCE
 	@echo ""
 
 clean-local:
-	rm -f *.exp *.def *.base *.a *.objs symdummy.c
+	$(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 \
+		if test -d $$i && test -f $$i/Makefile ; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
 			( cd $$i; $(MAKE) $(MFLAGS) clean ); \
 			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 \
-		if test -d $$i -a -f $$i/Makefile ; then \
+		if test -d $$i && test -f $$i/Makefile ; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
 			( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \
 		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)
 	-$(MKDIR) $(DESTDIR)$(localstatedir)/run
-	$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
+	$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
 		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
 	@for i in $(SUBDIRS); do \
-	    if test -d $$i -a -f $$i/Makefile ; then \
+	    if test -d $$i && test -f $$i/Makefile ; then \
 		echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
 		( cd $$i; $(MAKE) $(MFLAGS) install ); \
 		if test $$? != 0 ; then exit 1; fi ; \
 	    fi; \
 	done
 
-all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS)
+all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS) dynamic_overlays
 	@if test $(PLAT) = NT; then \
 	    sysconfdir=`cygpath -w $(sysconfdir) | \
 		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
@@ -378,28 +405,20 @@ all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS)
 	touch all-cffiles
 
 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" ; \
-		if test ! -f $$SD ; then \
-			echo "installing $$SF in $(schemadir)" ; \
-			echo $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD ; \
-			$(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD ; \
-		else \
-			echo "PRESERVING EXISTING SCHEMA FILE $$SD" ; \
-		fi ; \
-		$(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD.default ; \
+	@if test -d $(DESTDIR)$(schemadir) ; then \
+		echo "MOVING EXISTING SCHEMA DIR to $(DESTDIR)$(schemadir).$$$$" ; \
+		mv $(DESTDIR)$(schemadir) $(DESTDIR)$(schemadir).$$$$ ; \
+	fi
+	$(MKDIR) $(DESTDIR)$(schemadir)
+	@SD=$(DESTDIR)$(schemadir) ; \
+	files=`cd $(srcdir)/schema ; echo README *.ldif *.schema` ; \
+	for i in $$files ; do \
+		echo $(INSTALL) $(INSTALLFLAGS) -m 444 schema/$$i $$SD/$$i ; \
+		$(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i ; \
 	done
 
 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)"; \
@@ -409,9 +428,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 $(DESTDIR)$(sbindir); rm -f $(SLAPTOOLS); \
 	for i in $(SLAPTOOLS); do \
-		$(LN_S) $(DESTDIR)$(libexecdir)/slapd $$i; done
+		$(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
+		$(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
+	done