minor naming cleanup; improvements to DN mapping layer; major docs update

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index a58e5421ebff0d31c8433dd205c2ac32664bc745..d8b4fc9e7543f092bfd93667b54445d1f28aa0e6 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-2004 The OpenLDAP Foundation.
+## Copyright 1998-2005 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -33,11 +33,11 @@ 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 \
-               backover.c ctxcsn.c ldapsync.c sessionlog.c \
+               sasl.c module.c mra.c mods.c sl_malloc.c zn_malloc.c limits.c \
+               operational.c matchedValues.c cancel.c syncrepl.c \
+               backover.c ctxcsn.c ldapsync.c sessionlog.c frontend.c \
                slapadd.c slapcat.c slapcommon.c slapdn.c slapindex.c \
-               slappasswd.c slaptest.c slapauth.c slapacl.c \
+               slappasswd.c slaptest.c slapauth.c slapacl.c component.c \
                $(@PLAT@_SRCS)
 
 OBJS   = main.o globals.o config.o daemon.o \
@@ -50,14 +50,14 @@ 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 \
-               backover.o ctxcsn.o ldapsync.o sessionlog.o \
+               sasl.o module.o mra.o mods.o sl_malloc.o zn_malloc.o limits.o \
+               operational.o matchedValues.o cancel.o syncrepl.o \
+               backover.o ctxcsn.o ldapsync.o sessionlog.o frontend.o \
                slapadd.o slapcat.o slapcommon.o slapdn.o slapindex.o \
-               slappasswd.o slaptest.o slapauth.o slapacl.o \
+               slappasswd.o slaptest.o slapauth.o slapacl.o component.o \
                $(@PLAT@_OBJS)
 
-LDAP_INCDIR= ../../include -I$(srcdir)/slapi
+LDAP_INCDIR= ../../include -I$(srcdir)/slapi -I.
 LDAP_LIBDIR= ../../libraries
 
 SLAP_DIR=
@@ -257,7 +257,7 @@ 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$(EXEEXT) $$i$(EXEEXT); done
 
@@ -265,7 +265,7 @@ slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
 sslapd: version.o
        $(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS) $(WRAP_LIBS)
 
-$(SLAPD_DYNAMIC_BACKENDS): slapd
+dummy $(SLAPD_DYNAMIC_BACKENDS): slapd
        cd $@; $(MAKE) $(MFLAGS) all
        @touch $@
 
@@ -313,6 +313,8 @@ libbackends.a: .backend
 liboverlays.a: FORCE
        @cd overlays; $(MAKE) $(MFLAGS) all
 
+backend.c: backend.h
+
 version.c: Makefile
        @-$(RM) $@
        $(MKVERSION) -s -n Versionstr slapd > $@
@@ -330,7 +332,7 @@ depend-local-srv: FORCE
        @echo ""
 
 clean-local:
-       rm -f *.exp *.def *.base *.a *.objs symdummy.c
+       $(RM) *.exp *.def *.base *.a *.objs symdummy.c
 
 clean-local-srv: FORCE
        @for i in $(SUBDIRS); do \
@@ -340,7 +342,7 @@ clean-local-srv: FORCE
                        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 \
@@ -426,9 +428,8 @@ install-db-config: FORCE
 
 install-tools: FORCE
        -$(MKDIR) $(DESTDIR)$(sbindir)
-       cd $(DESTDIR)$(sbindir); \
-       rm -f $(SLAPTOOLS); \
        for i in $(SLAPTOOLS); do \
-               $(LN_S) $(libexecdir)/slapd$(EXEEXT) $$i$(EXEEXT); \
+               $(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
+               $(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
        done