Modified make system to support CVS instead of RCS

diff --git a/Make-common b/Make-common
index 32683c7652d35b60ecd15a31077b643752b8a6ed..405842cc4fa9a0aedce8443db9ed3654cbabafbb 100644 (file)
--- a/Make-common
+++ b/Make-common
@@ -28,8 +28,9 @@
 # man pages are put under MANDIR
 # programs end-users will run are put in BINDIR
 #
-INSTROOT=/usr/local
-ETCDIR= $(INSTROOT)/etc
+PREFIX?=/usr/local
+INSTROOT=${PREFIX}
+ETCDIR= $(INSTROOT)/etc/ldap
 INCLUDEDIR= $(INSTROOT)/include
 LIBDIR= $(INSTROOT)/lib
 MANDIR= $(INSTROOT)/man
@@ -45,6 +46,7 @@ RUNTIMEETCDIR= $(ETCDIR)
 #############################################################################
 # Passed to every compile (cc or gcc).  This is where you put -O or -g, etc.
 #EXTRACFLAGS=-g
+EXTRACFLAGS=-O
 # Passed to every link (ld).  Include -g here if you did in EXTRACFLAGS.
 #EXTRALDFLAGS=-g
 
@@ -122,8 +124,8 @@ SLAPD_BACKENDS= -DLDAP_LDBM -DLDAP_SHELL -DLDAP_PASSWD
 # four choices: Berkeley db b-tree, Berkeley db hash, GNU dbm, or ndbm.
 #
 # berkeley db btree package
-#LDBMBACKEND=-DLDBM_USE_DBBTREE
-#LDBMINCLUDE=-I/usr/local/db/include
+LDBMBACKEND=-DLDBM_USE_DBBTREE
+LDBMINCLUDE=-I/usr/include
 #LDBMLIB=-ldb
 # berkeley db hash package
 #LDBMBACKEND=-DLDBM_USE_DBHASH
@@ -134,7 +136,7 @@ SLAPD_BACKENDS= -DLDAP_LDBM -DLDAP_SHELL -DLDAP_PASSWD
 #LDBMINCLUDE=-I/usr/local/gdbm/include
 #LDBMLIB=-lgdbm
 # standard unix ndbm
-LDBMBACKEND=-DLDBM_USE_NDBM
+#LDBMBACKEND=-DLDBM_USE_NDBM
 #
 # if you want to use a non-default threads package change these lines
 #THREADS=-DNO_THREADS

diff --git a/Makefile b/Makefile
index a8103f2270cc1fc1685b384550c4479467f18bc8..05b7363c326f38d6eb3e2a4485ca0e86f80a0ce5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -202,16 +202,17 @@ checkin:  FORCE
            done
 
 tar:   veryclean
+#      $(RM) ./Make-common;  \
+#      $(CP) ./Make-common.dist ./Make-common; \
+#      $(CHMOD) 644 ./Make-common; \
+#      $(RM) ./include/ldapconfig.h.edit; \
+#      $(CP) ./include/ldapconfig.h.dist ./include/ldapconfig.h.edit; \
+#      $(CHMOD) 644 ./include/ldapconfig.h.edit; 
        @PWD=`pwd`; \
-       $(RM) ./Make-common;  \
-       $(CP) ./Make-common.dist ./Make-common; \
-       $(CHMOD) 644 ./Make-common; \
-       $(RM) ./include/ldapconfig.h.edit; \
-       $(CP) ./include/ldapconfig.h.dist ./include/ldapconfig.h.edit; \
-       $(CHMOD) 644 ./include/ldapconfig.h.edit; \
        BASE=`$(BASENAME) $$PWD`; XFILE=/tmp/ldap-x.$$$$; \
        ( cd .. ; $(CAT) $$BASE/exclude >$$XFILE; \
          $(FIND) $$BASE -name RCS -print >> $$XFILE ; \
+         $(FIND) $$BASE -name CVS -print >> $$XFILE ; \
          $(FIND) $$BASE -name obj-\* -print >> $$XFILE ; \
          $(FIND) $$BASE -name tags -print >> $$XFILE ; \
          $(TAR) cvfX ./$$BASE.tar $$XFILE $$BASE; \

diff --git a/build/platforms/Makefile b/build/platforms/Makefile
index 38f3194d6359780f63ad45aa689a3785fd87e532..31a7db605420ba735845c8fd70c93865de62fe62 100644 (file)
--- a/build/platforms/Makefile
+++ b/build/platforms/Makefile
@@ -27,7 +27,7 @@ install:      FORCE
 clean: FORCE
        @echo "making clean in `pwd`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                ( cd $$i; $(MAKE) $(MFLAGS) clean ); \
            fi; \
@@ -36,7 +36,7 @@ clean:        FORCE
 veryclean:     FORCE
        @echo "making veryclean in `pwd`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a -f $$i/Makefile ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) veryclean"; \
                ( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \
            fi; \

diff --git a/build/platforms/freebsd-gcc/Make-platform b/build/platforms/freebsd-gcc/Make-platform
index 895b32f2af7e0fbaab628022a6f008b596a33141..b1e28023da5d6b037e2c13fc7490f7861bdf4f9c 100644 (file)
--- a/build/platforms/freebsd-gcc/Make-platform
+++ b/build/platforms/freebsd-gcc/Make-platform
@@ -11,6 +11,7 @@
 # -------------------------------------------------------------------------
 # you will probably not need to edit anything below this point
 # -------------------------------------------------------------------------
-CC     = gcc
+CC     = cc
 
 PLATFORMCFLAGS=        -Dfreebsd
+PLATFORMLIBS= -lcrypt

diff --git a/clients/Make-template b/clients/Make-template
index 76a02d5a266c51bf459e86ae965c604e69bb394c..8be29e500e2223648174dd504a4029e274a33eb7 100644 (file)
--- a/clients/Make-template
+++ b/clients/Make-template
@@ -22,7 +22,7 @@
 all:   FORCE
        @echo "making all in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) all"; \
                ( cd $$i; $(MAKE) $(MFLAGS) all ); \
            fi; \
@@ -36,7 +36,7 @@ all:  FORCE
 install:       FORCE
        @echo "making install in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
                ( cd $$i; $(MAKE) $(MFLAGS) install ); \
            fi; \
@@ -49,7 +49,7 @@ install:      FORCE
 clean: FORCE
        @echo "making clean in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                ( cd $$i; $(MAKE) $(MFLAGS) clean ); \
            fi; \
@@ -65,7 +65,7 @@ veryclean:    clean
 depend:        FORCE
        @echo "making depend in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
                ( cd $$i; $(MAKE) $(MFLAGS) depend ); \
            fi; \
@@ -74,7 +74,7 @@ depend:       FORCE
 links:
        @echo "making links in `$(PWD)`"; \
        for i in .src/*; do \
-           if [ -d $$i -a $$i != ".src/RCS" ]; then \
+           if [ -d $$i -a $$i != ".src/CVS" ]; then \
                d=`basename $$i`; \
                ( $(MKDIR) $$d; cd $$d; $(LN) ../.src/$$d .src; \
                  $(LN) ../.src/$$d/Make-template . ; \

diff --git a/clients/fax500/Make-template b/clients/fax500/Make-template
index e3b224d77260d447008d1afbcd9138468b9d007f..997cc6513db04e84e706a20a66482e46d813368c 100644 (file)
--- a/clients/fax500/Make-template
+++ b/clients/fax500/Make-template
@@ -55,7 +55,7 @@ fax5version.c:        main.o faxtotpc.o $(LDIR)/libldap.a
 install:       rp500 xrpcomp fax500 FORCE
                -$(MKDIR) -p $(ETCDIR) $(BINDIR)
                $(INSTALL) $(INSTALLFLAGS) -m 755 rp500 $(ETCDIR)
-               $(SED) -e 's%ETCDIR%$(ETCDIR)%' xrpcomp > /tmp/xrpcomp.tmp
+               $(SED) -e 's%ETCDIR%$(RUNTIMEETCDIR)%' xrpcomp > /tmp/xrpcomp.tmp
                $(INSTALL) $(INSTALLFLAGS) -m 755 /tmp/xrpcomp.tmp $(BINDIR)/xrpcomp
                $(RM) /tmp/xrpcomp.tmp
                $(INSTALL) $(INSTALLFLAGS) -m 755 fax500 $(ETCDIR)
@@ -78,10 +78,10 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-rp500.o: rp500.c ../../include/ldapconfig.h ../../include/lber.h
-rp500.o: ../../include/ldap.h
-main.o: main.c ../../include/ldapconfig.h ../../include/portable.h
-main.o: ../../include/lber.h ../../include/ldap.h
+rp500.o: rp500.c ../../include/ldapconfig.h ../../include/proto-lber.h
+rp500.o: ../../include/proto-ldap.h
+main.o: main.c ../../include/portable.h ../../include/proto-lber.h
+main.o: ../../include/proto-ldap.h
 faxtotpc.o: faxtotpc.c
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/clients/finger/Make-template b/clients/finger/Make-template
index d55329f839fe14446ada794c65eb0536a78cb594..93d8b8dc39d9af41303a7b2e366e01411f6d2869 100644 (file)
--- a/clients/finger/Make-template
+++ b/clients/finger/Make-template
@@ -63,8 +63,7 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-main.o: main.c ../../include/lber.h ../../include/ldap.h
-main.o: ../../include/disptmpl.h ../../include/portable.h
-main.o: ../../include/ldapconfig.h
+main.o: main.c ../../include/ldap.h ../../include/proto-ldap.h
+main.o: ../../include/portable.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/clients/gopher/Make-template b/clients/gopher/Make-template
index 9c45559d7a0f18af345675e603134d93515e9081..18a907038adfb98a0e671900cc866576764cb1e0 100644 (file)
--- a/clients/gopher/Make-template
+++ b/clients/gopher/Make-template
@@ -80,12 +80,11 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-go500.o: go500.c ../../include/portable.h ../../include/ldapconfig.h
-go500.o: ../../include/lber.h ../../include/ldap.h ../../include/disptmpl.h
-go500gw.o: go500gw.c ../../include/lber.h ../../include/ldap.h
-go500gw.o: ../../include/disptmpl.h ../../include/portable.h
+go500.o: go500.c ../../include/ldapconfig.h ../../include/proto-lber.h
+go500.o: ../../include/proto-ldap.h
+go500gw.o: go500gw.c ../../include/ldap.h ../../include/proto-ldap.h
 go500gw.o: ../../include/ldapconfig.h
-detach.o: detach.c ../../include/portable.h
+detach.o: detach.c
 setproctitle.o: setproctitle.c
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/clients/mail500/Make-template b/clients/mail500/Make-template
index bdac2a2fc4f151fa4e0e1b3a71c805708382e9f7..360eaa8b345fedbd2c0e3ad68f5c52c3af78d575 100644 (file)
--- a/clients/mail500/Make-template
+++ b/clients/mail500/Make-template
@@ -62,7 +62,7 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-main.o: main.c ../../include/portable.h ../../include/lber.h
-main.o: ../../include/ldap.h ../../include/ldapconfig.h
+main.o: main.c ../../include/portable.h ../../include/proto-lber.h
+main.o: ../../include/proto-ldap.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/clients/rcpt500/Make-template b/clients/rcpt500/Make-template
index 2677021a9ec542000e22dafce105782ed4cc9101..7fc84bdfeb7d8a6ba4c391107992ce5ba76833f8 100644 (file)
--- a/clients/rcpt500/Make-template
+++ b/clients/rcpt500/Make-template
@@ -61,11 +61,10 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-main.o: main.c ../../include/portable.h ../../include/ldapconfig.h rcpt500.h
-cmds.o: cmds.c rcpt500.h
-help.o: help.c ../../include/portable.h ../../include/ldapconfig.h rcpt500.h
-query.o: query.c ../../include/lber.h ../../include/ldap.h
-query.o: ../../include/portable.h ../../include/ldapconfig.h
-query.o: ../../include/disptmpl.h rcpt500.h
+main.o: main.c ../../include/portable.h
+cmds.o: cmds.c
+help.o: help.c ../../include/portable.h
+query.o: query.c ../../include/proto-lber.h ../../include/proto-ldap.h
+query.o: ../../include/ldapconfig.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/clients/tools/Make-template b/clients/tools/Make-template
index af3b4d575854f2e8e688d1da91a10b73e427a98c..2ad49462a5143486b3cf9a92e04b9cb7143f2cca 100644 (file)
--- a/clients/tools/Make-template
+++ b/clients/tools/Make-template
@@ -106,13 +106,13 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-ldapsearch.o: ldapsearch.c ../../include/lber.h ../../include/ldap.h
-ldapsearch.o: ../../include/ldif.h ../../include/ldapconfig.h
-ldapmodify.o: ldapmodify.c ../../include/lber.h ../../include/ldap.h
-ldapmodify.o: ../../include/ldif.h ../../include/ldapconfig.h
-ldapdelete.o: ldapdelete.c ../../include/lber.h ../../include/ldap.h
+ldapsearch.o: ldapsearch.c ../../include/lber.h ../../include/proto-ldap.h
+ldapsearch.o: ../../include/ldapconfig.h
+ldapmodify.o: ldapmodify.c ../../include/lber.h ../../include/proto-ldap.h
+ldapmodify.o: ../../include/ldapconfig.h
+ldapdelete.o: ldapdelete.c ../../include/proto-lber.h
 ldapdelete.o: ../../include/ldapconfig.h
-ldapmodrdn.o: ldapmodrdn.c ../../include/lber.h ../../include/ldap.h
+ldapmodrdn.o: ldapmodrdn.c ../../include/proto-lber.h
 ldapmodrdn.o: ../../include/ldapconfig.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/clients/ud/Make-template b/clients/ud/Make-template
index 1cba01cbd19c0450b177f8e163c99a91b5c8832b..ed9d8faad8dae202f28a7384ec443ad7b8527cb3 100644 (file)
--- a/clients/ud/Make-template
+++ b/clients/ud/Make-template
@@ -80,21 +80,17 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-main.o: main.c ../../include/lber.h ../../include/ldap.h
-main.o: ../../include/ldapconfig.h ../../include/portable.h ud.h
-find.o: find.c ../../include/lber.h ../../include/ldap.h ud.h
-mod.o: mod.c ../../include/lber.h ../../include/ldap.h ud.h
-print.o: print.c ../../include/lber.h ../../include/ldap.h ud.h
-auth.o: auth.c ../../include/lber.h ../../include/ldap.h
-auth.o: ../../include/ldapconfig.h ud.h
-util.o: util.c ../../include/lber.h ../../include/ldap.h
-util.o: ../../include/ldapconfig.h ../../include/portable.h ud.h
-help.o: help.c ../../include/lber.h ../../include/ldap.h ud.h
+main.o: main.c ../../include/lber.h ../../include/proto-ldap.h
+main.o: ../../include/portable.h
+find.o: find.c ../../include/proto-lber.h ../../include/proto-ldap.h
+mod.o: mod.c ../../include/proto-lber.h ../../include/proto-ldap.h
+print.o: print.c ../../include/proto-lber.h ../../include/proto-ldap.h
+auth.o: auth.c ../../include/proto-lber.h ../../include/proto-ldap.h
+util.o: util.c ../../include/proto-lber.h ../../include/ldapconfig.h
+help.o: help.c ../../include/proto-lber.h ../../include/proto-ldap.h
 string_to_key.o: string_to_key.c
-group.o: group.c ../../include/lber.h ../../include/ldap.h
-group.o: ../../include/ldapconfig.h ud.h
-edit.o: edit.c ../../include/lber.h ../../include/ldap.h
-edit.o: ../../include/ldapconfig.h ud.h
-globals.o: globals.c ud.h
+group.o: group.c ../../include/lber.h ../../include/proto-ldap.h
+edit.o: edit.c ../../include/lber.h ../../include/proto-ldap.h
+globals.o: globals.c
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/doc/Make-template b/doc/Make-template
index 1dea71cc90b305638eb3edee61ef782ea762450f..0eefcfe18e8467e3df25bb29a0071484bef28cd0 100644 (file)
--- a/doc/Make-template
+++ b/doc/Make-template
@@ -22,7 +22,7 @@
 all:   FORCE
        @echo "making all in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) all"; \
                ( cd $$i; $(MAKE) $(MFLAGS) all ); \
            fi; \
@@ -32,7 +32,7 @@ all:  FORCE
 install:       FORCE
        @echo "making install in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
                ( cd $$i; $(MAKE) $(MFLAGS) install ); \
            fi; \
@@ -42,7 +42,7 @@ install:      FORCE
 clean: FORCE
        @echo "making clean in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                ( cd $$i; $(MAKE) $(MFLAGS) clean ); \
            fi; \
@@ -55,7 +55,7 @@ veryclean:    clean
 depend:        FORCE
        @echo "making depend in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
                ( cd $$i; $(MAKE) $(MFLAGS) depend ); \
            fi; \
@@ -65,7 +65,7 @@ depend:       FORCE
 lint:  FORCE
        @echo "making lint in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) lint"; \
                ( cd $$i; $(MAKE) $(MFLAGS) lint ); \
            fi; \
@@ -75,7 +75,7 @@ lint: FORCE
 5lint: FORCE
        @echo "making 5lint in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) 5lint"; \
                ( cd $$i; $(MAKE) $(MFLAGS) 5lint ); \
            fi; \
@@ -85,7 +85,7 @@ lint: FORCE
 links:
        @echo "making links in `$(PWD)`"; \
        for i in .src/*; do \
-           if [ -d $$i -a $$i != ".src/RCS" ]; then \
+           if [ -d $$i -a $$i != ".src/CVS" ]; then \
                d=`basename $$i`; \
                ( $(MKDIR) $$d; cd $$d; $(LN) ../.src/$$d .src; \
                  $(LN) ../.src/$$d/Make-template . ; \

diff --git a/doc/man/Make-template b/doc/man/Make-template
index e975170f3e25fabcfe9441a18800f5e4b4703571..8d7f5bf1fac243b7d15ea489a7e7411d38ddac8d 100644 (file)
--- a/doc/man/Make-template
+++ b/doc/man/Make-template
@@ -22,7 +22,7 @@
 all:   FORCE
        @echo "making all in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) all"; \
                ( cd $$i; $(MAKE) $(MFLAGS) all ); \
            fi; \
@@ -36,7 +36,7 @@ all:  FORCE
 install:       FORCE
        @echo "making install in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
                ( cd $$i; $(MAKE) $(MFLAGS) install ); \
            fi; \
@@ -49,7 +49,7 @@ install:      FORCE
 clean: FORCE
        @echo "making clean in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                ( cd $$i; $(MAKE) $(MFLAGS) clean ); \
            fi; \
@@ -65,7 +65,7 @@ veryclean:    clean
 depend:        FORCE
        @echo "making depend in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
                ( cd $$i; $(MAKE) $(MFLAGS) depend ); \
            fi; \
@@ -74,7 +74,7 @@ depend:       FORCE
 links:
        @echo "making links in `$(PWD)`"; \
        for i in .src/*; do \
-           if [ -d $$i -a $$i != ".src/RCS" ]; then \
+           if [ -d $$i -a $$i != ".src/CVS" ]; then \
                d=`basename $$i`; \
                ( $(MKDIR) $$d; cd $$d; $(LN) ../.src/$$d .src; \
                  $(LN) ../.src/$$d/Make-template . ; \

diff --git a/doc/man/man1/Make-template b/doc/man/man1/Make-template
index dfc4a5136970ddf2ea65c7e4f67d0690f5c0adb8..5b7a9206ad27bd64759c6131f3beaebec5542eb0 100644 (file)
--- a/doc/man/man1/Make-template
+++ b/doc/man/man1/Make-template
@@ -31,10 +31,8 @@ install:     FORCE
            $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \
            if [ -f "$$page.links" ]; then \
                for link in `$(CAT) $$page.links`; do \
-                   echo ".so man$(SECT)/$$page" > $$TMPMAN; \
                    echo "installing $(INSTDIR)/$$link as link to $$page"; \
-                   $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN \
-                           $(INSTDIR)/$$link; \
+                   ln -sf $$page.gz $(INSTDIR)/$$link.gz; \
                done; \
            fi; \
        done; \

diff --git a/doc/man/man3/Make-template b/doc/man/man3/Make-template
index 6e153f694f30e71b4e604ebb4d3d90282dc70c76..a91cb2efbe0be77499bc9ae436a53a78a2e87a52 100644 (file)
--- a/doc/man/man3/Make-template
+++ b/doc/man/man3/Make-template
@@ -31,10 +31,8 @@ install:     FORCE
            $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \
            if [ -f "$$page.links" ]; then \
                for link in `$(CAT) $$page.links`; do \
-                   echo ".so man$(SECT)/$$page" > $$TMPMAN; \
                    echo "installing $(INSTDIR)/$$link as link to $$page"; \
-                   $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN \
-                           $(INSTDIR)/$$link; \
+                   ln -sf $$page.gz $(INSTDIR)/$$link.gz; \
                done; \
            fi; \
        done; \

diff --git a/doc/man/man5/Make-template b/doc/man/man5/Make-template
index 3d2d5544bf2259fa1c76505741526f89a84ae044..828df9b871dfb381f030c2db7dc45a291f112661 100644 (file)
--- a/doc/man/man5/Make-template
+++ b/doc/man/man5/Make-template
@@ -31,10 +31,8 @@ install:     FORCE
            $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \
            if [ -f "$$page.links" ]; then \
                for link in `$(CAT) $$page.links`; do \
-                   echo ".so man$(SECT)/$$page" > $$TMPMAN; \
                    echo "installing $(INSTDIR)/$$link as link to $$page"; \
-                   $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN \
-                           $(INSTDIR)/$$link; \
+                   ln -sf $$page.gz $(INSTDIR)/$$link.gz; \
                done; \
            fi; \
        done; \

diff --git a/doc/man/man8/Make-template b/doc/man/man8/Make-template
index 55899f5274d1e0c909a8ab56dec127e157a6716b..d256bf57921d94440f0407f793a706964023c82e 100644 (file)
--- a/doc/man/man8/Make-template
+++ b/doc/man/man8/Make-template
@@ -31,10 +31,8 @@ install:     FORCE
            $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \
            if [ -f "$$page.links" ]; then \
                for link in `$(CAT) $$page.links`; do \
-                   echo ".so man$(SECT)/$$page" > $$TMPMAN; \
                    echo "installing $(INSTDIR)/$$link as link to $$page"; \
-                   $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN \
-                           $(INSTDIR)/$$link; \
+                   ln -sf $$page.gz $(INSTDIR)/$$link.gz; \
                done; \
            fi; \
        done; \

diff --git a/libraries/Make-template b/libraries/Make-template
index 7f6c06df019057a2135fde9ac4f8c4bf77e20501..95169e554e57dc467e5252ae81d4ddeadb699f04 100644 (file)
--- a/libraries/Make-template
+++ b/libraries/Make-template
@@ -26,7 +26,7 @@
 all:   FORCE
        @echo "making all in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) all"; \
                ( cd $$i; $(MAKE) $(MFLAGS) all ); \
            fi; \
@@ -40,7 +40,7 @@ all:  FORCE
 install:       FORCE
        @echo "making install in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
                ( cd $$i; $(MAKE) $(MFLAGS) install ); \
            fi; \
@@ -52,7 +52,7 @@ install:      FORCE
 clean: FORCE
        @echo "making clean in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                ( cd $$i; $(MAKE) $(MFLAGS) clean ); \
            fi; \
@@ -67,7 +67,7 @@ veryclean:    clean
 depend:        FORCE
        @echo "making depend in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
                ( cd $$i; $(MAKE) $(MFLAGS) depend ); \
            fi; \
@@ -76,7 +76,7 @@ depend:       FORCE
 links:
        @echo "making links in `$(PWD)`"; \
        for i in .src/*; do \
-           if [ -d $$i -a $$i != ".src/RCS" ]; then \
+           if [ -d $$i -a $$i != ".src/CVS" ]; then \
                d=`basename $$i`; \
                ( $(MKDIR) $$d; cd $$d; $(LN) ../.src/$$d .src; \
                  $(LN) ../.src/$$d/Make-template . ; \

diff --git a/libraries/liblber/Make-template b/libraries/liblber/Make-template
index f1b9dd4f363c792ee52ac5bb4bbdec1e957d119e..6f292127119cf5b38f75e2af24e1040d84ee8007 100644 (file)
--- a/libraries/liblber/Make-template
+++ b/libraries/liblber/Make-template
@@ -77,9 +77,9 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-decode.o: decode.c ../../include/lber.h
+decode.o: decode.c ../../include/proto-lber.h
 encode.o: encode.c ../../include/lber.h
-io.o: io.c ../../include/lber.h
-bprint.o: bprint.c ../../include/lber.h
+io.o: io.c ../../include/proto-lber.h
+bprint.o: bprint.c ../../include/proto-lber.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/libraries/libldap/Make-template b/libraries/libldap/Make-template
index 9ca5d7f234c29423f4271e032d450e63edbee0da..58aaff569bac6cfa41ea579ab89a4e1d218ac74a 100644 (file)
--- a/libraries/libldap/Make-template
+++ b/libraries/libldap/Make-template
@@ -96,48 +96,43 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-bind.o: bind.c ../../include/lber.h ../../include/ldap.h
-open.o: open.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-result.o: result.c ../../include/portable.h ../../include/lber.h
-result.o: ../../include/ldap.h ldap-int.h
-error.o: error.c ../../include/lber.h ../../include/ldap.h
-compare.o: compare.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-search.o: search.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-modify.o: modify.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-add.o: add.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-modrdn.o: modrdn.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-delete.o: delete.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-abandon.o: abandon.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-ufn.o: ufn.c ../../include/lber.h ../../include/ldap.h
-cache.o: cache.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-getfilter.o: getfilter.c ../../include/lber.h ../../include/ldap.h
-getfilter.o: ../../include/regex.h
-regex.o: regex.c ../../include/portable.h
-sbind.o: sbind.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-kbind.o: kbind.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-unbind.o: unbind.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-friendly.o: friendly.c ../../include/lber.h ../../include/ldap.h
-cldap.o: cldap.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-free.o: free.c ../../include/lber.h ../../include/ldap.h
-disptmpl.o: disptmpl.c ../../include/lber.h ../../include/ldap.h
-disptmpl.o: ../../include/disptmpl.h
-srchpref.o: srchpref.c ../../include/lber.h ../../include/ldap.h
-srchpref.o: ../../include/srchpref.h
-dsparse.o: dsparse.c ../../include/lber.h ../../include/ldap.h
-tmplout.o: tmplout.c ../../include/lber.h ../../include/ldap.h
-tmplout.o: ../../include/disptmpl.h
-sort.o: sort.c ../../include/lber.h ../../include/ldap.h
-getdn.o: getdn.c ../../include/lber.h ../../include/ldap.h
-getentry.o: getentry.c ../../include/lber.h ../../include/ldap.h
-getattr.o: getattr.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-getvalues.o: getvalues.c ../../include/lber.h ../../include/ldap.h
-addentry.o: addentry.c ../../include/lber.h ../../include/ldap.h
-request.o: request.c ../../include/portable.h ../../include/lber.h
-request.o: ../../include/ldap.h ldap-int.h
+bind.o: bind.c ../../include/lber.h ../../include/proto-ldap.h
+open.o: open.c ../../include/proto-lber.h ../../include/proto-ldap.h
+result.o: result.c ../../include/portable.h ../../include/proto-lber.h
+result.o: ../../include/proto-ldap.h
+error.o: error.c ../../include/lber.h ../../include/proto-ldap.h
+compare.o: compare.c ../../include/lber.h ../../include/proto-ldap.h
+search.o: search.c ../../include/lber.h ../../include/proto-ldap.h
+modify.o: modify.c ../../include/lber.h ../../include/proto-ldap.h
+add.o: add.c ../../include/lber.h ../../include/proto-ldap.h
+modrdn.o: modrdn.c ../../include/lber.h ../../include/proto-ldap.h
+delete.o: delete.c ../../include/lber.h ../../include/proto-ldap.h
+abandon.o: abandon.c ../../include/lber.h ../../include/proto-ldap.h
+ufn.o: ufn.c ../../include/lber.h ../../include/proto-ldap.h
+cache.o: cache.c ../../include/lber.h ../../include/proto-ldap.h
+getfilter.o: getfilter.c ../../include/lber.h ../../include/proto-ldap.h
+regex.o: regex.c
+sbind.o: sbind.c ../../include/lber.h ../../include/proto-ldap.h
+kbind.o: kbind.c
+unbind.o: unbind.c ../../include/proto-lber.h ../../include/proto-ldap.h
+friendly.o: friendly.c ../../include/lber.h ../../include/proto-ldap.h
+cldap.o: cldap.c
+free.o: free.c ../../include/ldap.h
+disptmpl.o: disptmpl.c ../../include/proto-lber.h ../../include/proto-ldap.h
+srchpref.o: srchpref.c ../../include/proto-lber.h ../../include/proto-ldap.h
+dsparse.o: dsparse.c ../../include/proto-lber.h ../../include/proto-ldap.h
+tmplout.o: tmplout.c ../../include/proto-lber.h ../../include/proto-ldap.h
+sort.o: sort.c ../../include/proto-lber.h
+getdn.o: getdn.c ../../include/lber.h ../../include/proto-ldap.h
+getentry.o: getentry.c ../../include/lber.h ../../include/proto-ldap.h
+getattr.o: getattr.c ../../include/lber.h ../../include/proto-ldap.h
+getvalues.o: getvalues.c ../../include/lber.h ../../include/proto-ldap.h
+addentry.o: addentry.c ../../include/lber.h ../../include/proto-ldap.h
+request.o: request.c ../../include/portable.h ../../include/proto-lber.h
+request.o: ../../include/proto-ldap.h
 getdxbyname.o: getdxbyname.c
-os-ip.o: os-ip.c ../../include/portable.h ../../include/lber.h
-os-ip.o: ../../include/ldap.h
-url.o: url.c ../../include/lber.h ../../include/ldap.h ldap-int.h
+os-ip.o: os-ip.c ../../include/proto-lber.h ../../include/proto-ldap.h
+url.o: url.c ../../include/lber.h ../../include/proto-ldap.h
 charset.o: charset.c
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/libraries/libldbm/Make-template b/libraries/libldbm/Make-template
index 09ad2ee08fae3fd355abebfda8bf0ebe77cdbcd5..ac7df08700498fc4c4cbedfd057825a9c0e0ff74 100644 (file)
--- a/libraries/libldbm/Make-template
+++ b/libraries/libldbm/Make-template
@@ -66,6 +66,6 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-ldbm.o: ldbm.c ../../include/ldbm.h
+ldbm.o: ldbm.c
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/libraries/libldif/Make-template b/libraries/libldif/Make-template
index 75061f7e5d862ac7d76941fb45ce7f82d2d5b38d..319cc51cb58f5a65e236c58700b85ac164e2b842 100644 (file)
--- a/libraries/libldif/Make-template
+++ b/libraries/libldif/Make-template
@@ -63,7 +63,6 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-line64.o: line64.c ../../include/lber.h ../../include/ldap.h
-line64.o: ../../include/ldif.h
+line64.o: line64.c ../../include/proto-lber.h ../../include/proto-ldap.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/libraries/liblthread/Make-template b/libraries/liblthread/Make-template
index 2344ba925c50ab10b8796643c3bbb17e7d4ed8fa..c0721b1890e67296e11ed369567bcb4cfef761c1 100644 (file)
--- a/libraries/liblthread/Make-template
+++ b/libraries/liblthread/Make-template
@@ -63,7 +63,7 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-thread.o: thread.c ../../include/lthread.h
-stack.o: stack.c ../../include/lber.h ../../include/ldap.h
+thread.o: thread.c
+stack.o: stack.c ../../include/proto-lber.h ../../include/proto-ldap.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/servers/Make-template b/servers/Make-template
index 39eb1240f1aa3d0fe3ff9db99604eb0dbe2299ea..6dbca325adb1f0b726c502eb78aff03d91ed08b7 100644 (file)
--- a/servers/Make-template
+++ b/servers/Make-template
@@ -26,7 +26,7 @@
 all:   FORCE
        @echo "making all in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo "  cd $$i; $(MAKE) $(MFLAGS) all"; \
                ( cd $$i; $(MAKE) $(MFLAGS) all ); \
            fi; \
@@ -40,7 +40,7 @@ all:  FORCE
 install:       FORCE
        @echo "making install in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
                ( cd $$i; $(MAKE) $(MFLAGS) install ); \
            fi; \
@@ -53,7 +53,7 @@ install:      FORCE
 clean: FORCE
        @echo "making clean in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                ( cd $$i; $(MAKE) $(MFLAGS) clean ); \
            fi; \
@@ -69,7 +69,7 @@ veryclean:    clean
 depend:        FORCE
        @echo "making depend in `$(PWD)`"
        @for i in *; do \
-           if [ -d $$i -a $$i != "RCS" ]; then \
+           if [ -d $$i -a $$i != "CVS" ]; then \
                echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
                ( cd $$i; $(MAKE) $(MFLAGS) depend ); \
            fi; \
@@ -78,7 +78,7 @@ depend:       FORCE
 links:
        @echo "making links in `$(PWD)`"; \
        for i in .src/*; do \
-           if [ -d $$i -a $$i != ".src/RCS" ]; then \
+           if [ -d $$i -a $$i != ".src/CVS" ]; then \
                d=`basename $$i`; \
                ( $(MKDIR) $$d; cd $$d; $(LN) ../.src/$$d .src; \
                  $(LN) ../.src/$$d/Make-template . ; \

diff --git a/servers/slapd/Make-template b/servers/slapd/Make-template
index d3a5f49884f4d0ce453b89642c22a9faf83c4a2d..5b614b75aa6e55a9123688436b89b2be6c313635 100644 (file)
--- a/servers/slapd/Make-template
+++ b/servers/slapd/Make-template
@@ -168,99 +168,80 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-main.o: main.c ../../include/portable.h slap.h ../../include/avl.h
-main.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-main.o: ../../include/ldif.h ../../include/ldapconfig.h
-daemon.o: daemon.c slap.h ../../include/avl.h ../../include/lber.h
-daemon.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-daemon.o: ../../include/portable.h ../../include/ldapconfig.h
-connection.o: connection.c ../../include/portable.h slap.h ../../include/avl.h
-connection.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-connection.o: ../../include/ldif.h
-search.o: search.c slap.h ../../include/avl.h ../../include/lber.h
-search.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-search.o: ../../include/ldapconfig.h
-filter.o: filter.c slap.h ../../include/avl.h ../../include/lber.h
-filter.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-add.o: add.c slap.h ../../include/avl.h ../../include/lber.h
-add.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-charray.o: charray.c slap.h ../../include/avl.h ../../include/lber.h
-charray.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-attr.o: attr.c ../../include/portable.h slap.h ../../include/avl.h
-attr.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
+main.o: main.c ../../include/portable.h ../../include/avl.h
+main.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldapconfig.h
+daemon.o: daemon.c ../../include/avl.h ../../include/ldap.h
+daemon.o: ../../include/lthread.h ../../include/portable.h
+connection.o: connection.c ../../include/portable.h ../../include/avl.h
+connection.o: ../../include/ldap.h ../../include/lthread.h
+search.o: search.c ../../include/proto-lber.h ../../include/proto-ldap.h
+search.o: ../../include/ldif.h
+filter.o: filter.c ../../include/proto-lber.h ../../include/proto-ldap.h
+filter.o: ../../include/ldif.h
+add.o: add.c ../../include/avl.h ../../include/ldap.h
+add.o: ../../include/proto-ldap.h ../../include/ldif.h
+charray.o: charray.c ../../include/proto-lber.h ../../include/proto-ldap.h
+charray.o: ../../include/ldif.h
+attr.o: attr.c ../../include/proto-lber.h ../../include/proto-ldap.h
 attr.o: ../../include/ldif.h
-entry.o: entry.c slap.h ../../include/avl.h ../../include/lber.h
-entry.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-config.o: config.c slap.h ../../include/avl.h ../../include/lber.h
-config.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-config.o: ../../include/ldapconfig.h
-backend.o: backend.c slap.h ../../include/avl.h ../../include/lber.h
-backend.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-result.o: result.c ../../include/portable.h slap.h ../../include/avl.h
-result.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-result.o: ../../include/ldif.h
-operation.o: operation.c slap.h ../../include/avl.h ../../include/lber.h
-operation.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-dn.o: dn.c ../../include/portable.h slap.h ../../include/avl.h
-dn.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-dn.o: ../../include/ldif.h
-compare.o: compare.c slap.h ../../include/avl.h ../../include/lber.h
-compare.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-modify.o: modify.c slap.h ../../include/avl.h ../../include/lber.h
-modify.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-delete.o: delete.c slap.h ../../include/avl.h ../../include/lber.h
-delete.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-modrdn.o: modrdn.c slap.h ../../include/avl.h ../../include/lber.h
-modrdn.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-ch_malloc.o: ch_malloc.c slap.h ../../include/avl.h ../../include/lber.h
-ch_malloc.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-value.o: value.c ../../include/portable.h slap.h ../../include/avl.h
-value.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-value.o: ../../include/ldif.h
-ava.o: ava.c slap.h ../../include/avl.h ../../include/lber.h
-ava.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-bind.o: bind.c slap.h ../../include/avl.h ../../include/lber.h
-bind.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-unbind.o: unbind.c slap.h ../../include/avl.h ../../include/lber.h
-unbind.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-abandon.o: abandon.c slap.h ../../include/avl.h ../../include/lber.h
-abandon.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-filterentry.o: filterentry.c ../../include/regex.h slap.h ../../include/avl.h
-filterentry.o: ../../include/lber.h ../../include/ldap.h
-filterentry.o: ../../include/lthread.h ../../include/ldif.h
-phonetic.o: phonetic.c ../../include/portable.h slap.h ../../include/avl.h
-phonetic.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-phonetic.o: ../../include/ldif.h
-regex.o: regex.c ../../include/portable.h
-acl.o: acl.c ../../include/regex.h slap.h ../../include/avl.h
-acl.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
+entry.o: entry.c ../../include/avl.h ../../include/ldap.h
+entry.o: ../../include/lthread.h
+config.o: config.c ../../include/proto-lber.h ../../include/proto-ldap.h
+config.o: ../../include/ldif.h
+backend.o: backend.c ../../include/avl.h ../../include/ldap.h
+backend.o: ../../include/lthread.h
+result.o: result.c ../../include/portable.h ../../include/avl.h
+result.o: ../../include/ldap.h ../../include/lthread.h
+operation.o: operation.c ../../include/proto-lber.h ../../include/proto-ldap.h
+operation.o: ../../include/ldif.h
+dn.o: dn.c ../../include/portable.h ../../include/avl.h ../../include/ldap.h
+dn.o: ../../include/lthread.h
+compare.o: compare.c ../../include/avl.h ../../include/ldap.h
+compare.o: ../../include/lthread.h
+modify.o: modify.c ../../include/avl.h ../../include/ldap.h
+modify.o: ../../include/proto-ldap.h ../../include/ldif.h
+delete.o: delete.c ../../include/proto-lber.h ../../include/proto-ldap.h
+delete.o: ../../include/ldif.h
+modrdn.o: modrdn.c ../../include/proto-lber.h ../../include/proto-ldap.h
+modrdn.o: ../../include/ldif.h
+ch_malloc.o: ch_malloc.c ../../include/avl.h ../../include/ldap.h
+ch_malloc.o: ../../include/lthread.h
+value.o: value.c ../../include/portable.h ../../include/avl.h
+value.o: ../../include/ldap.h ../../include/lthread.h
+ava.o: ava.c ../../include/proto-lber.h ../../include/proto-ldap.h
+ava.o: ../../include/ldif.h
+bind.o: bind.c ../../include/proto-lber.h ../../include/proto-ldap.h
+bind.o: ../../include/ldif.h
+unbind.o: unbind.c ../../include/avl.h ../../include/ldap.h
+unbind.o: ../../include/lthread.h
+abandon.o: abandon.c ../../include/avl.h ../../include/ldap.h
+abandon.o: ../../include/lthread.h
+filterentry.o: filterentry.c ../../include/proto-lber.h
+filterentry.o: ../../include/proto-ldap.h ../../include/ldif.h
+phonetic.o: phonetic.c ../../include/portable.h ../../include/avl.h
+phonetic.o: ../../include/ldap.h ../../include/lthread.h
+regex.o: regex.c
+acl.o: acl.c slap.h ../../include/proto-lber.h ../../include/proto-ldap.h
 acl.o: ../../include/ldif.h
-str2filter.o: str2filter.c slap.h ../../include/avl.h ../../include/lber.h
-str2filter.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-aclparse.o: aclparse.c ../../include/regex.h slap.h ../../include/avl.h
-aclparse.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-aclparse.o: ../../include/ldif.h ../../include/portable.h
-init.o: init.c ../../include/portable.h slap.h ../../include/avl.h
-init.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-init.o: ../../include/ldif.h
-detach.o: detach.c ../../include/portable.h
+str2filter.o: str2filter.c ../../include/avl.h ../../include/ldap.h
+str2filter.o: ../../include/lthread.h
+aclparse.o: aclparse.c slap.h ../../include/proto-lber.h
+aclparse.o: ../../include/proto-ldap.h ../../include/ldif.h
+init.o: init.c ../../include/portable.h ../../include/avl.h
+init.o: ../../include/ldap.h ../../include/lthread.h
+detach.o: detach.c
 strdup.o: strdup.c
 tempnam.o: tempnam.c
-repl.o: repl.c slap.h ../../include/avl.h ../../include/lber.h
-repl.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-lock.o: lock.c ../../include/portable.h slap.h ../../include/avl.h
-lock.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-lock.o: ../../include/ldif.h
-schema.o: schema.c slap.h ../../include/avl.h ../../include/lber.h
-schema.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-schemaparse.o: schemaparse.c slap.h ../../include/avl.h ../../include/lber.h
-schemaparse.o: ../../include/ldap.h ../../include/lthread.h
-schemaparse.o: ../../include/ldif.h
-monitor.o: monitor.c slap.h ../../include/avl.h ../../include/lber.h
-monitor.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-monitor.o: ../../include/ldapconfig.h
-configinfo.o: configinfo.c slap.h ../../include/avl.h ../../include/lber.h
-configinfo.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-configinfo.o: ../../include/ldapconfig.h
+repl.o: repl.c ../../include/proto-lber.h ../../include/proto-ldap.h
+repl.o: ../../include/ldif.h
+lock.o: lock.c ../../include/avl.h ../../include/ldap.h ../../include/lthread.h
+schema.o: schema.c ../../include/proto-lber.h ../../include/proto-ldap.h
+schema.o: ../../include/ldif.h
+schemaparse.o: schemaparse.c ../../include/avl.h ../../include/ldap.h
+schemaparse.o: ../../include/lthread.h
+monitor.o: monitor.c ../../include/proto-lber.h ../../include/proto-ldap.h
+monitor.o: ../../include/ldif.h
+configinfo.o: configinfo.c ../../include/avl.h ../../include/ldap.h
+configinfo.o: ../../include/lthread.h ../../include/ldapconfig.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/servers/slapd/back-ldbm/Make-template b/servers/slapd/back-ldbm/Make-template
index 51ef7a8171294c91122cb78f26ffe34787504850..f2fe468b1e6163b92c22d6a4924b40475ad65b71 100644 (file)
--- a/servers/slapd/back-ldbm/Make-template
+++ b/servers/slapd/back-ldbm/Make-template
@@ -34,7 +34,7 @@ LDFLAGS       = -L$(LDIR) $(KRBLIBFLAG)
 all:   FORCE
        -@echo "$(SLAPD_BACKENDS)" | grep LDAP_LDBM 2>&1 > /dev/null; \
        if [ $$? = 0 ]; then \
-            $(MAKE) $(MFLAGS) CC=$(CC) libback-ldbm.a; \
+            $(MAKE) $(MFLAGS) CC="$(CC)" libback-ldbm.a; \
        else \
            echo "Include -DLDAP_LDBM in SLAPD_BACKENDS in the"; \
            echo "Make-common file to build the ldbm backend"; \
@@ -72,77 +72,59 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-idl.o: idl.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-idl.o: ../../../include/ldap.h ../../../include/lthread.h
-idl.o: ../../../include/ldif.h ../../../include/ldapconfig.h back-ldbm.h
-idl.o: ../../../include/ldbm.h
-add.o: add.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-add.o: ../../../include/ldap.h ../../../include/lthread.h
-add.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-search.o: search.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-search.o: ../../../include/ldap.h ../../../include/lthread.h
-search.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-cache.o: cache.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-cache.o: ../../../include/ldap.h ../../../include/lthread.h
-cache.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-dbcache.o: dbcache.c ../../../include/portable.h ../slap.h
-dbcache.o: ../../../include/avl.h ../../../include/lber.h
-dbcache.o: ../../../include/ldap.h ../../../include/lthread.h
-dbcache.o: ../../../include/ldif.h ../../../include/ldapconfig.h back-ldbm.h
-dbcache.o: ../../../include/ldbm.h
-dn2id.o: dn2id.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-dn2id.o: ../../../include/ldap.h ../../../include/lthread.h
-dn2id.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-id2entry.o: id2entry.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-id2entry.o: ../../../include/ldap.h ../../../include/lthread.h
-id2entry.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-index.o: index.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-index.o: ../../../include/ldap.h ../../../include/lthread.h
-index.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-id2children.o: id2children.c ../slap.h ../../../include/avl.h
-id2children.o: ../../../include/lber.h ../../../include/ldap.h
-id2children.o: ../../../include/lthread.h ../../../include/ldif.h back-ldbm.h
+idl.o: idl.c ../../../include/avl.h ../../../include/proto-lber.h
+idl.o: ../../../include/proto-ldap.h ../../../include/ldif.h back-ldbm.h
+add.o: add.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+add.o: ../../../include/ldif.h ../../../include/ldbm.h
+search.o: search.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+search.o: ../../../include/ldif.h ../../../include/ldbm.h
+cache.o: cache.c ../../../include/avl.h ../../../include/proto-lber.h
+cache.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+cache.o: ../../../include/ldbm.h
+dbcache.o: dbcache.c ../../../include/portable.h ../../../include/avl.h
+dbcache.o: ../../../include/proto-lber.h ../../../include/proto-ldap.h
+dbcache.o: ../../../include/ldif.h back-ldbm.h
+dn2id.o: dn2id.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+dn2id.o: ../../../include/ldif.h ../../../include/ldbm.h
+id2entry.o: id2entry.c ../../../include/avl.h ../../../include/proto-lber.h
+id2entry.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+id2entry.o: ../../../include/ldbm.h
+index.o: index.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+index.o: ../../../include/ldif.h ../../../include/ldbm.h
+id2children.o: id2children.c ../../../include/proto-lber.h
+id2children.o: ../../../include/proto-ldap.h ../../../include/ldif.h
 id2children.o: ../../../include/ldbm.h
-nextid.o: nextid.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-nextid.o: ../../../include/ldap.h ../../../include/lthread.h
-nextid.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
+nextid.o: nextid.c ../../../include/avl.h ../../../include/proto-lber.h
+nextid.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+nextid.o: ../../../include/ldbm.h
 abandon.o: abandon.c
-compare.o: compare.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-compare.o: ../../../include/ldap.h ../../../include/lthread.h
-compare.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-modify.o: modify.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-modify.o: ../../../include/ldap.h ../../../include/lthread.h
-modify.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-modrdn.o: modrdn.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-modrdn.o: ../../../include/ldap.h ../../../include/lthread.h
-modrdn.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-delete.o: delete.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-delete.o: ../../../include/ldap.h ../../../include/lthread.h
-delete.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-init.o: init.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-init.o: ../../../include/ldap.h ../../../include/lthread.h
-init.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-config.o: config.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-config.o: ../../../include/ldap.h ../../../include/lthread.h
-config.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-bind.o: bind.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-bind.o: ../../../include/ldap.h ../../../include/lthread.h
-bind.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-attr.o: attr.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-attr.o: ../../../include/ldap.h ../../../include/lthread.h
-attr.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-filterindex.o: filterindex.c ../slap.h ../../../include/avl.h
-filterindex.o: ../../../include/lber.h ../../../include/ldap.h
-filterindex.o: ../../../include/lthread.h ../../../include/ldif.h back-ldbm.h
-filterindex.o: ../../../include/ldbm.h
-unbind.o: unbind.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-unbind.o: ../../../include/ldap.h ../../../include/lthread.h
-unbind.o: ../../../include/ldif.h
-kerberos.o: kerberos.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-kerberos.o: ../../../include/ldap.h ../../../include/lthread.h
-kerberos.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-close.o: close.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-close.o: ../../../include/ldap.h ../../../include/lthread.h
-close.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
+compare.o: compare.c ../../../include/proto-lber.h
+compare.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+compare.o: ../../../include/ldbm.h
+modify.o: modify.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+modify.o: ../../../include/ldif.h ../../../include/ldbm.h
+modrdn.o: modrdn.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+modrdn.o: ../../../include/ldif.h ../../../include/ldbm.h
+delete.o: delete.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+delete.o: ../../../include/ldif.h ../../../include/ldbm.h
+init.o: init.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+init.o: ../../../include/ldif.h ../../../include/ldbm.h
+config.o: config.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+config.o: ../../../include/ldif.h ../../../include/ldbm.h
+bind.o: bind.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+bind.o: ../../../include/ldif.h ../../../include/ldbm.h
+attr.o: attr.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+attr.o: ../../../include/ldif.h ../../../include/ldbm.h
+filterindex.o: filterindex.c ../../../include/avl.h
+filterindex.o: ../../../include/proto-lber.h ../../../include/proto-ldap.h
+filterindex.o: ../../../include/ldif.h ../../../include/ldbm.h
+unbind.o: unbind.c ../../../include/avl.h ../../../include/proto-lber.h
+unbind.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+kerberos.o: kerberos.c ../../../include/proto-lber.h
+kerberos.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+kerberos.o: ../../../include/ldbm.h
+close.o: close.c ../../../include/avl.h ../../../include/proto-lber.h
+close.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+close.o: ../../../include/ldbm.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/servers/slapd/back-passwd/Make-template b/servers/slapd/back-passwd/Make-template
index 39ea8c292effb4f9b7f7251ab2bb7a96a423168a..6283b10fe9a64b621d74070d393807ad67ed5a23 100644 (file)
--- a/servers/slapd/back-passwd/Make-template
+++ b/servers/slapd/back-passwd/Make-template
@@ -68,11 +68,10 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-search.o: search.c ../../../include/portable.h ../slap.h ../../../include/avl.h
-search.o: ../../../include/lber.h ../../../include/ldap.h
-search.o: ../../../include/lthread.h ../../../include/ldif.h
-config.o: config.c ../../../include/portable.h ../slap.h ../../../include/avl.h
-config.o: ../../../include/lber.h ../../../include/ldap.h
-config.o: ../../../include/lthread.h ../../../include/ldif.h
+search.o: search.c ../../../include/portable.h ../../../include/avl.h
+search.o: ../../../include/proto-lber.h ../../../include/proto-ldap.h
+search.o: ../../../include/ldif.h
+config.o: config.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+config.o: ../../../include/ldif.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/servers/slapd/back-shell/Make-template b/servers/slapd/back-shell/Make-template
index 1eb631b57eb294d547675e2fd4e855b29755a27b..b72d05efe0998101cbc3a87799f361e27daa096b 100644 (file)
--- a/servers/slapd/back-shell/Make-template
+++ b/servers/slapd/back-shell/Make-template
@@ -70,44 +70,31 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-init.o: init.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-init.o: ../../../include/ldap.h ../../../include/lthread.h
-init.o: ../../../include/ldif.h shell.h
-config.o: config.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-config.o: ../../../include/ldap.h ../../../include/lthread.h
-config.o: ../../../include/ldif.h shell.h
-fork.o: fork.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-fork.o: ../../../include/ldap.h ../../../include/lthread.h
+init.o: init.c ../../../include/avl.h ../../../include/proto-lber.h
+init.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+config.o: config.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+config.o: ../../../include/ldif.h
+fork.o: fork.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
 fork.o: ../../../include/ldif.h
-search.o: search.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-search.o: ../../../include/ldap.h ../../../include/lthread.h
-search.o: ../../../include/ldif.h shell.h
-bind.o: bind.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-bind.o: ../../../include/ldap.h ../../../include/lthread.h
-bind.o: ../../../include/ldif.h shell.h
-unbind.o: unbind.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-unbind.o: ../../../include/ldap.h ../../../include/lthread.h
-unbind.o: ../../../include/ldif.h shell.h
-add.o: add.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-add.o: ../../../include/ldap.h ../../../include/lthread.h
-add.o: ../../../include/ldif.h shell.h
-delete.o: delete.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-delete.o: ../../../include/ldap.h ../../../include/lthread.h
-delete.o: ../../../include/ldif.h shell.h
-modify.o: modify.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-modify.o: ../../../include/ldap.h ../../../include/lthread.h
-modify.o: ../../../include/ldif.h shell.h
-modrdn.o: modrdn.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-modrdn.o: ../../../include/ldap.h ../../../include/lthread.h
-modrdn.o: ../../../include/ldif.h shell.h
-compare.o: compare.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-compare.o: ../../../include/ldap.h ../../../include/lthread.h
-compare.o: ../../../include/ldif.h shell.h
-abandon.o: abandon.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-abandon.o: ../../../include/ldap.h ../../../include/lthread.h
-abandon.o: ../../../include/ldif.h shell.h
-result.o: result.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-result.o: ../../../include/ldap.h ../../../include/lthread.h
-result.o: ../../../include/ldif.h shell.h
+search.o: search.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+search.o: ../../../include/ldif.h
+bind.o: bind.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+bind.o: ../../../include/ldif.h
+unbind.o: unbind.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+unbind.o: ../../../include/ldif.h
+add.o: add.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+add.o: ../../../include/ldif.h
+delete.o: delete.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+delete.o: ../../../include/ldif.h
+modify.o: modify.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+modify.o: ../../../include/ldif.h
+modrdn.o: modrdn.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+modrdn.o: ../../../include/ldif.h
+compare.o: compare.c ../../../include/proto-lber.h
+compare.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+abandon.o: abandon.c ../../../include/avl.h ../../../include/proto-lber.h
+abandon.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+result.o: result.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+result.o: ../../../include/ldif.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/servers/slapd/tools/Make-template b/servers/slapd/tools/Make-template
index 112c4abbd81bb1c4a8e151e1223c8c07f383f3a3..14b013ad308ec777f163f1e566024800450d72e5 100644 (file)
--- a/servers/slapd/tools/Make-template
+++ b/servers/slapd/tools/Make-template
@@ -178,42 +178,30 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-chlog2replog.o: chlog2replog.c ../../../include/ldif.h
-edb2ldif.o: edb2ldif.c
-ldapsyntax.o: ldapsyntax.c ../../../include/lber.h ../../../include/ldap.h
-ldapsyntax.o: ../../../include/ldif.h ldapsyntax.h
-ldif2index.o: ldif2index.c ../slap.h ../../../include/avl.h
-ldif2index.o: ../../../include/lber.h ../../../include/ldap.h
-ldif2index.o: ../../../include/lthread.h ../../../include/ldif.h
-ldif2ldbm.o: ldif2ldbm.c ../slap.h ../../../include/avl.h
-ldif2ldbm.o: ../../../include/lber.h ../../../include/ldap.h
-ldif2ldbm.o: ../../../include/lthread.h ../../../include/ldif.h
-ldif2ldbm.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h
-ldif2id2entry.o: ldif2id2entry.c ../slap.h ../../../include/avl.h
-ldif2id2entry.o: ../../../include/lber.h ../../../include/ldap.h
-ldif2id2entry.o: ../../../include/lthread.h ../../../include/ldif.h
-ldif2id2entry.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h
-ldif2id2children.o: ldif2id2children.c ../slap.h ../../../include/avl.h
-ldif2id2children.o: ../../../include/lber.h ../../../include/ldap.h
-ldif2id2children.o: ../../../include/lthread.h ../../../include/ldif.h
-ldif2id2children.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h
-ldbmcat.o: ldbmcat.c ../../../include/ldbm.h ../slap.h ../../../include/avl.h
-ldbmcat.o: ../../../include/lber.h ../../../include/ldap.h
-ldbmcat.o: ../../../include/lthread.h ../../../include/ldif.h
-centipede.o: centipede.c ../../../include/lber.h ../../../include/ldap.h
-centipede.o: ../../../include/ldapconfig.h ../../../include/ldbm.h
-sizecount.o: sizecount.c ../../../include/ldbm.h ../../../include/lber.h
-sizecount.o: ../../../include/ldap.h ../../../include/portable.h
-ldif2ldbm.sed.o: ldif2ldbm.sed.c ../slap.h ../../../include/avl.h
-ldif2ldbm.sed.o: ../../../include/lber.h ../../../include/ldap.h
-ldif2ldbm.sed.o: ../../../include/lthread.h ../../../include/ldif.h
-ldif2ldbm.sed.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h
-ldbmtest.o: ldbmtest.c ../../../include/portable.h
-ldbmtest.o: ../../../include/ldapconfig.h ../slap.h ../../../include/avl.h
-ldbmtest.o: ../../../include/lber.h ../../../include/ldap.h
-ldbmtest.o: ../../../include/lthread.h ../../../include/ldif.h
-ldbmtest.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h
-ldif.o: ldif.c ../../../include/lber.h ../../../include/ldap.h
-ldif.o: ../../../include/ldif.h
+ldif2index.o: ldif2index.c ../../../include/avl.h ../../../include/proto-lber.h
+ldif2index.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+ldif2ldbm.o: ldif2ldbm.c ../../../include/proto-lber.h
+ldif2ldbm.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+ldif2ldbm.o: ../../../include/ldbm.h
+ldif2id2entry.o: ldif2id2entry.c ../../../include/avl.h
+ldif2id2entry.o: ../../../include/proto-lber.h ../../../include/proto-ldap.h
+ldif2id2entry.o: ../../../include/ldif.h ../../../include/ldbm.h
+ldif2id2children.o: ldif2id2children.c ../../../include/avl.h
+ldif2id2children.o: ../../../include/proto-lber.h ../../../include/proto-ldap.h
+ldif2id2children.o: ../../../include/ldif.h ../../../include/ldbm.h
+ldbmcat.o: ldbmcat.c ../../../include/proto-lber.h
+ldbmcat.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+centipede.o: centipede.c ../../../include/proto-lber.h
+centipede.o: ../../../include/proto-ldap.h ../../../include/ldbm.h
+sizecount.o: sizecount.c ../../../include/lber.h ../../../include/ldap.h
+sizecount.o: ../../../include/proto-ldap.h
+ldif2ldbm.sed.o: ldif2ldbm.sed.c ../../../include/avl.h
+ldif2ldbm.sed.o: ../../../include/proto-lber.h ../../../include/proto-ldap.h
+ldif2ldbm.sed.o: ../../../include/ldif.h ../../../include/ldbm.h
+ldbmtest.o: ldbmtest.c ../../../include/ldapconfig.h ../../../include/avl.h
+ldbmtest.o: ../../../include/proto-lber.h ../../../include/proto-ldap.h
+ldbmtest.o: ../../../include/ldif.h ../../../include/ldbm.h
+ldbmtest.o: ../back-ldbm/proto-back-ldbm.h
+ldif.o: ldif.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/servers/slurpd/Make-template b/servers/slurpd/Make-template
index a43494093d589c6313590d74114abbaaf61d3035..04beedfaec264bf376dffec9dd1d73d11cd343af 100644 (file)
--- a/servers/slurpd/Make-template
+++ b/servers/slurpd/Make-template
@@ -81,67 +81,42 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-admin.o: admin.c slurp.h ../../include/lber.h ../../include/ldap.h
-admin.o: ../../include/lthread.h ../../include/portable.h
-admin.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-args.o: args.c ../../include/lber.h ../../include/ldap.h slurp.h
-args.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-args.o: ../../include/portable.h ../../include/ldapconfig.h
-args.o: ../../include/ldif.h globals.h slurp.h
-ch_malloc.o: ch_malloc.c ../slapd/slap.h ../../include/avl.h
-ch_malloc.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-ch_malloc.o: ../../include/ldif.h
-config.o: config.c ../../include/lber.h ../../include/ldap.h slurp.h
-config.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-config.o: ../../include/portable.h ../../include/ldapconfig.h
-config.o: ../../include/ldif.h globals.h slurp.h
-detach.o: detach.c ../../include/portable.h
-fm.o: fm.c slurp.h ../../include/lber.h ../../include/ldap.h
-fm.o: ../../include/lthread.h ../../include/portable.h
-fm.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-globals.o: globals.c slurp.h ../../include/lber.h ../../include/ldap.h
-globals.o: ../../include/lthread.h ../../include/portable.h
-globals.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-ldap_op.o: ldap_op.c ../../include/lber.h ../../include/ldap.h
-ldap_op.o: ../../include/portable.h slurp.h ../../include/lber.h
-ldap_op.o: ../../include/ldap.h ../../include/lthread.h
-ldap_op.o: ../../include/portable.h ../../include/ldapconfig.h
-ldap_op.o: ../../include/ldif.h
-lock.o: lock.c ../../include/portable.h ../slapd/slap.h ../../include/avl.h
-lock.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-lock.o: ../../include/ldif.h
-main.o: main.c slurp.h ../../include/lber.h ../../include/ldap.h
-main.o: ../../include/lthread.h ../../include/portable.h
-main.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-re.o: re.c ../slapd/slap.h ../../include/avl.h ../../include/lber.h
-re.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h slurp.h
-re.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-re.o: ../../include/portable.h ../../include/ldapconfig.h ../../include/ldif.h
-re.o: globals.h slurp.h
-reject.o: reject.c slurp.h ../../include/lber.h ../../include/ldap.h
-reject.o: ../../include/lthread.h ../../include/portable.h
-reject.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-replica.o: replica.c slurp.h ../../include/lber.h ../../include/ldap.h
-replica.o: ../../include/lthread.h ../../include/portable.h
-replica.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-replog.o: replog.c ../../include/portable.h slurp.h ../../include/lber.h
-replog.o: ../../include/ldap.h ../../include/lthread.h ../../include/portable.h
-replog.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-ri.o: ri.c slurp.h ../../include/lber.h ../../include/ldap.h
-ri.o: ../../include/lthread.h ../../include/portable.h
-ri.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-rq.o: rq.c slurp.h ../../include/lber.h ../../include/ldap.h
-rq.o: ../../include/lthread.h ../../include/portable.h
-rq.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-sanity.o: sanity.c slurp.h ../../include/lber.h ../../include/ldap.h
-sanity.o: ../../include/lthread.h ../../include/portable.h
-sanity.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-sanity.o: ../../include/portable.h
-st.o: st.c slurp.h ../../include/lber.h ../../include/ldap.h
-st.o: ../../include/lthread.h ../../include/portable.h
-st.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-tsleep.o: tsleep.c slurp.h ../../include/lber.h ../../include/ldap.h
-tsleep.o: ../../include/lthread.h ../../include/portable.h
-tsleep.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
+admin.o: admin.c ../../include/lber.h ../../include/proto-ldap.h
+admin.o: ../../include/portable.h ../../include/ldif.h
+args.o: args.c ../../include/lber.h ../../include/proto-ldap.h
+args.o: ../../include/lthread.h ../../include/ldapconfig.h
+ch_malloc.o: ch_malloc.c ../../include/avl.h ../../include/ldap.h
+ch_malloc.o: ../../include/lthread.h
+config.o: config.c ../../include/lber.h ../../include/proto-ldap.h
+config.o: ../../include/lthread.h ../../include/ldapconfig.h
+detach.o: detach.c
+fm.o: fm.c ../../include/lber.h ../../include/proto-ldap.h
+fm.o: ../../include/portable.h ../../include/ldif.h
+globals.o: globals.c ../../include/lber.h ../../include/proto-ldap.h
+globals.o: ../../include/portable.h ../../include/ldif.h
+ldap_op.o: ldap_op.c ../../include/proto-lber.h ../../include/proto-ldap.h
+ldap_op.o: ../../include/lthread.h ../../include/ldif.h
+lock.o: lock.c ../../include/portable.h ../../include/avl.h
+lock.o: ../../include/ldap.h ../../include/lthread.h
+main.o: main.c ../../include/lber.h ../../include/proto-ldap.h
+main.o: ../../include/portable.h ../../include/ldif.h
+re.o: re.c ../slapd/slap.h ../../include/lber.h ../../include/proto-ldap.h
+re.o: ../../include/ldif.h ../../include/portable.h
+reject.o: reject.c ../../include/lber.h ../../include/proto-ldap.h
+reject.o: ../../include/portable.h ../../include/ldif.h
+replica.o: replica.c ../../include/lber.h ../../include/proto-ldap.h
+replica.o: ../../include/portable.h ../../include/ldif.h
+replog.o: replog.c ../../include/portable.h ../../include/proto-lber.h
+replog.o: ../../include/proto-ldap.h ../../include/ldapconfig.h
+ri.o: ri.c ../../include/lber.h ../../include/proto-ldap.h
+ri.o: ../../include/portable.h ../../include/ldif.h
+rq.o: rq.c ../../include/lber.h ../../include/proto-ldap.h
+rq.o: ../../include/portable.h ../../include/ldif.h
+sanity.o: sanity.c ../../include/lber.h ../../include/proto-ldap.h
+sanity.o: ../../include/portable.h ../../include/ldif.h
+st.o: st.c ../../include/lber.h ../../include/proto-ldap.h
+st.o: ../../include/portable.h ../../include/ldif.h
+tsleep.o: tsleep.c ../../include/lber.h ../../include/proto-ldap.h
+tsleep.o: ../../include/portable.h ../../include/ldif.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/tests/Make-template b/tests/Make-template
index f8cae98bf08ae7d4c83665094d4367e3c1217dee..7e49ed6c615f31a55d20049ff9dd132f1dc61509 100644 (file)
--- a/tests/Make-template
+++ b/tests/Make-template
@@ -24,7 +24,7 @@ install:      FORCE
 depend:        FORCE
 
 clean: FORCE
-       $(RM) test-db/* test-repl/*
+       $(RM) test-db/[a-z]* test-repl/[a-z]*
 
 veryclean:     clean