Skip spurious Statslog's for callback-intercepted responses.

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index e8a9968b38a158ab4595221352a7e22d3a8f311f..6a503c3f6d1875a3282d08a6b6556a22cbbea7e5 100644 (file)
--- 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-2003 The OpenLDAP Foundation.
+## Copyright 1998-2004 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -14,9 +14,11 @@
 ## <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
 
@@ -52,7 +54,7 @@ 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@
 
@@ -143,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; \
@@ -297,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 > $@
@@ -304,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 ); \
@@ -317,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 ); \
@@ -327,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 ); \
@@ -338,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 ); \