X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FMakefile.in;h=6a503c3f6d1875a3282d08a6b6556a22cbbea7e5;hb=89812424f4f844053cc2607e3e5e9382b0825bb8;hp=7f9e2a158a8caa7c5c4a78c17c1b302585431a09;hpb=28d466ba6677a3218af654392d8e673a02f6192c;p=openldap

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 7f9e2a158a..6a503c3f6d 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -1,13 +1,24 @@
+## Makefile.in for slapd
 # $OpenLDAP$
-## Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Makefile.in for slapd
+## Copyright 1998-2004 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
 ##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
+
 PROGRAMS=slapd
-XPROGRAMS=sslapd libbackends.a .backend
+XPROGRAMS=sslapd libbackends.a .backend liboverlays.a
 XSRCS=version.c
 
+SUBDIRS=back-* shell-backends slapi overlays tools
+
 NT_SRCS = nt_svc.c
 NT_OBJS = nt_svc.o ../../libraries/liblutil/slapdmsg.res
 
@@ -23,7 +34,7 @@ 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 limits.c \
 		backglue.c operational.c matchedValues.c cancel.c syncrepl.c \
-		backover.c ctxcsn.c $(@PLAT@_SRCS)
+		backover.c ctxcsn.c ldapsync.c sessionlog.c $(@PLAT@_SRCS)
 
 OBJS	= main.o globals.o config.o daemon.o \
 		connection.o search.o filter.o add.o cr.o \
@@ -37,13 +48,13 @@ 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 limits.o \
 		backglue.o operational.o matchedValues.o cancel.o syncrepl.o \
-		backover.o ctxcsn.o $(@PLAT@_OBJS)
+		backover.o ctxcsn.o ldapsync.o sessionlog.o $(@PLAT@_OBJS)
 
 LDAP_INCDIR= ../../include -I$(srcdir)/slapi
 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@
 
@@ -53,7 +64,7 @@ XDEFS = $(MODULES_CPPFLAGS)
 XLDFLAGS = $(MODULES_LDFLAGS)
 
 XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L)
-XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)
+XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS) $(SLAPI_LIBS) $(MODULES_LIBS)
 
 BUILD_OPT = "--enable-slapd"
@@ -83,7 +94,7 @@ SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS)
 # we want to export EVERY global symbol that it knows about (NOT including
 # symbols that are imported from other DLLs). The set of symbols to
 # export INCLUDES symbols from all static libraries that slapd gets
-# linked with, e.g. avl, ldbm, ldif, lunicode, lutil, etc. This list
+# linked with, e.g. avl, ldbm, lunicode, lutil, etc. This list
 # will also include liblber and libldap_r if they were built as static
 # libraries. ALSO included will be symbols from other STATIC libraries
 # outside the domain of the OpenLDAP source tree, e.g. regex, ltdl,
@@ -134,7 +145,7 @@ SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS)
 # Thus, we do the best we can by depending on version.o, which depends
 # on its own very long list of dependencies.
 #
-slapd.def: libbackends.a version.o
+slapd.def: libbackends.a liboverlays.a version.o
 	@for i in $(LDFLAGS) ; do \
 	    path=`expr "$$i" : "-L\(.*\)"`; \
 	    if test $$? != 0; then continue; fi; \
@@ -230,10 +241,10 @@ slapd.exp: libslapd.a
 	dlltool --dllname slapd.exe --input-def slapd.def \
 		--base-file slapd.base --output-exp $@
 
-slapi/libslapi.a: FORCE
+slapi/.libs/libslapi.a: FORCE
 	(cd slapi; $(MAKE) $(MFLAGS) all)
 
-libslapi.a: slapi/libslapi.a
+libslapi.a: slapi/.libs/libslapi.a
 	cp slapi/.libs/libslapi.a .
 
 slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
@@ -288,6 +299,9 @@ libbackends.a: .backend
 	fi
 	@ls -l libbackends.a; echo ""
 
+liboverlays.a: FORCE
+	@cd overlays; $(MAKE) $(MFLAGS) all
+
 version.c: Makefile
 	@-$(RM) $@
 	$(MKVERSION) -s -n Versionstr slapd > $@
@@ -295,7 +309,7 @@ version.c: Makefile
 version.o: version.c $(OBJS) $(SLAPD_LIBDEPEND) 
 
 depend-local-srv: FORCE
-	@for i in back-* shell-backends slapi tools; do \
+	@for i in $(SUBDIRS); do \
 		if test -d $$i -a -f $$i/Makefile ; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
 			( cd $$i; $(MAKE) $(MFLAGS) depend ); \
@@ -308,7 +322,7 @@ clean-local:
 	rm -f *.exp *.def *.base *.a *.objs symdummy.c
 
 clean-local-srv: FORCE
-	@for i in back-* shell-backends slapi tools; do \
+	@for i in $(SUBDIRS); do \
 		if test -d $$i -a -f $$i/Makefile ; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
 			( cd $$i; $(MAKE) $(MFLAGS) clean ); \
@@ -318,7 +332,7 @@ clean-local-srv: FORCE
 	rm -f *.tmp all-cffiles
 
 veryclean-local-srv: FORCE
-	@for i in back-* shell-backends slapi tools; do \
+	@for i in $(SUBDIRS); do \
 		if test -d $$i -a -f $$i/Makefile ; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
 			( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \
@@ -329,10 +343,10 @@ install-local-srv: install-slapd install-conf install-schema install-tools
 
 install-slapd: FORCE
 	-$(MKDIR) $(DESTDIR)$(libexecdir)
-	-$(MKDIR) $(DESTDIR)$(localstatedir)
+	-$(MKDIR) $(DESTDIR)$(localstatedir)/run
 	$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
 		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
-	@for i in back-* shell-backends slapi tools; do \
+	@for i in $(SUBDIRS); do \
 	    if test -d $$i -a -f $$i/Makefile ; then \
 		echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
 		( cd $$i; $(MAKE) $(MFLAGS) install ); \