Make all, clean, veryclean, depend, install all appear to work!

Now to sort out configure enable/with options.

diff --git a/build/dir.mk b/build/dir.mk
index e78f0be0862f1b41afa38570e334b21ef7178175..f86d3552b1dea1457b65398c52578f83878102a7 100644 (file)
--- a/build/dir.mk
+++ b/build/dir.mk
@@ -1,9 +1,10 @@
+##---------------------------------------------------------------------------
 ##
 ## Makes subdirectories
 ##
 
-all:   allsubs
-allsubs: FORCE
+
+all-common: all-local FORCE
        @echo "Making all in `$(PWD)`"
        @for i in $(SUBDIRS); do                                        \
                echo "  Entering subdirectory $$i";             \
@@ -11,8 +12,7 @@ allsubs: FORCE
                echo " ";                                                               \
        done
 
-install:       installsubs
-installsubs: FORCE
+install-common: install-local FORCE
        @echo "Making install in `$(PWD)`"
        @for i in $(SUBDIRS); do                                        \
                echo "  Entering subdirectory $$i";             \
@@ -20,8 +20,7 @@ installsubs: FORCE
                echo " ";                                                               \
        done
 
-clean: cleansubs
-cleansubs: FORCE
+clean-common: clean-local FORCE
        @echo "Making clean in `$(PWD)`"
        @for i in $(SUBDIRS); do                                        \
                echo "  Entering subdirectory $$i";             \
@@ -29,8 +28,7 @@ cleansubs: FORCE
                echo " ";                                                               \
        done
 
-veryclean: verysubs
-verysubs: FORCE
+veryclean-common: veryclean-local FORCE
        @echo "Making veryclean in `$(PWD)`"
        @for i in $(SUBDIRS); do                                        \
                echo "  Entering subdirectory $$i";             \
@@ -38,8 +36,7 @@ verysubs: FORCE
                echo " ";                                                               \
        done
 
-depend: dependsubs
-dependsubs: FORCE
+depend-common: depend-local FORCE
        @echo "Making depend in `$(PWD)`"
        @for i in $(SUBDIRS); do                                        \
                echo "  Entering subdirectory $$i";             \

diff --git a/build/info.mk b/build/info.mk
index 22f60cc444807eb29f2b62a02d202404c68f0b11..10e85e765fd76d721f32b19eae7d9185fa11ee60 100644 (file)
--- a/build/info.mk
+++ b/build/info.mk
@@ -1,3 +1,4 @@
+##---------------------------------------------------------------------------
 ##
 ## Makefile Template for Non-Source Directories
 ##

diff --git a/build/lib.mk b/build/lib.mk
index 21d2117d5d321e544832a9260a70d3d3bf6e9dc4..9b1e52a5c8a01568afc236e63ff68370e5fd1e2b 100644 (file)
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -1,8 +1,9 @@
+##---------------------------------------------------------------------------
 ##
 ## Makefile Template for Libraries
 ##
 
-all: $(LIBRARY) $(PROGRAMS)
+all-common: $(LIBRARY) $(PROGRAMS)
 
 $(LIBRARY): version.o
        $(AR) ru $@ $(OBJS) version.o
@@ -18,18 +19,22 @@ version.c: $(OBJS)
        -e "s|%VERSION%|$${v}|" \
        < Version.c > $@)
 
-install: all
+install-common: install-local
 
-lint: FORCE
+lint: lint-local FORCE
        $(LINT) $(DEFS) $(DEFINES) $(SRCS)
 
-lint5: FORCE
+lint5: lint5-local FORCE
        $(5LINT) $(DEFS) $(DEFINES) $(SRCS)
 
-clean:         FORCE
+clean-common:  clean-local
        $(RM) $(LIBRARY) ../$(LIBRARY) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) \
                *.o a.out core version.c
 
-depend: FORCE
+depend-common: depend-local
        $(MKDEP) $(DEFS) $(DEFINES) $(SRCS)
 
+veryclean-common: veryclean-local clean-common
+
+lint-local: FORCE
+lint5-local: FORCE

diff --git a/build/rules.mk b/build/rules.mk
index 00e63c3f90a6e561fbb2b8c34a8d7195e7619b4a..c9f7bf5d87be05e9fe8cdebe40c5e089fd189c2c 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -1,21 +1,26 @@
+##---------------------------------------------------------------------------
 ##
 ## Makefile Template for Programs
 ##
 
-all: $(PROGRAMS)
+all-common: all-local $(PROGRAMS)
 
-install: all
+install-common: all install-local
 
-lint: FORCE
-       $(LINT) $(DEFS) $(DEFINES) $(SRCS)
-
-lint5: FORCE
-       $(5LINT) $(DEFS) $(DEFINES) $(SRCS)
+clean-common:  clean-local
+       $(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) *.o a.out core
 
-clean:         FORCE
-       $(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) \
-               *.o a.out core
+veryclean-common: veryclean-local clean-local
 
-depend: FORCE
+depend-common: depend-local
        $(MKDEP) $(DEFS) $(DEFINES) $(SRCS)
 
+lint: lint-local
+       $(LINT) $(DEFS) $(DEFINES) $(SRCS)
+
+lint5: lint5-local
+       $(5LINT) $(DEFS) $(DEFINES) $(SRCS)
+
+# these could be empty
+lint-local: FORCE
+lint5-local: FORCE

diff --git a/build/srv.mk b/build/srv.mk
index 461549bd732a845020b2e753a99c3feb930aa06b..f93539b719f01cb55d03c72e963ce5a368161399 100644 (file)
--- a/build/srv.mk
+++ b/build/srv.mk
@@ -1,49 +1,71 @@
+##---------------------------------------------------------------------------
 ##
 ## Makefile Template for Servers
 ##
 
-all: FORCE
+all-common: FORCE
        @if [ "$(BUILD_SRV)" = "yes" ]; then \
                $(MAKE) $(MFLAGS) all-srv; \
        else \
                echo "run configure with $(BUILD_OPT) to build $(PROGRAMS)"; \
        fi
 
-clean: clean-srv FORCE
-lint: FORCE
+clean-common: FORCE
+       @if [ "$(BUILD_SRV)" = "yes" ]; then \
+               $(MAKE) $(MFLAGS) clean-srv; \
+       else \
+               echo "run configure with $(BUILD_OPT) to clean $(PROGRAMS)"; \
+       fi
+
+veryclean-common: FORCE
+       @if [ "$(BUILD_SRV)" = "yes" ]; then \
+               $(MAKE) $(MFLAGS) veryclean-srv; \
+       else \
+               echo "run configure with $(BUILD_OPT) to very clean $(PROGRAMS)"; \
+       fi
+
+lint-common: FORCE
        @if [ "$(BUILD_SRV)" = "yes" ]; then \
                $(MAKE) $(MFLAGS) lint-srv; \
        else \
                echo "run configure with $(BUILD_OPT) to lint $(PROGRAMS)"; \
        fi
 
-5lint: FORCE
+5lint-common: FORCE
        @if [ "$(BUILD_SRV)" = "yes" ]; then \
                $(MAKE) $(MFLAGS) 5lint-srv; \
        else \
                echo "run configure with $(BUILD_OPT) to 5lint $(PROGRAMS)"; \
        fi
 
-depend: FORCE
+depend-common: FORCE
        @if [ "$(BUILD_SRV)" = "yes" ]; then \
                $(MAKE) $(MFLAGS) depend-srv; \
        else \
-               echo "run configure with $(BUILD_OPT) to mkdepend $(PROGRAMS)"; \
+               echo "run configure with $(BUILD_OPT) to depend $(PROGRAMS)"; \
+       fi
+
+install-common: FORCE
+       @if [ "$(BUILD_SRV)" = "yes" ]; then \
+               $(MAKE) $(MFLAGS) install-srv; \
+       else \
+               echo "run configure with $(BUILD_OPT) to install $(PROGRAMS)"; \
        fi
 
-all-srv: FORCE
+all-srv: all-local
 
-install-srv: all-srv FORCE
+install-srv: all-srv install-local
 
-lint-srv: FORCE
+lint-srv: lint-local
        $(LINT) $(DEFS) $(DEFINES) $(SRCS)
 
-5lint-srv: FORCE
+5lint-srv: lint5-local
        $(5LINT) $(DEFS) $(DEFINES) $(SRCS)
 
-clean-srv:     FORCE
-       $(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) \
-               *.o a.out core
+clean-srv:     clean-local
+       $(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) *.o a.out core
 
-depend-srv: FORCE
+depend-srv: depend-local
        $(MKDEP) $(DEFS) $(DEFINES) $(SRCS)
+
+veryclean-srv:         clean-srv veryclean-local

diff --git a/build/top.mk b/build/top.mk
index fb65a1868bddcbf44b624efaa016a2f0bfdd08f4..8ef54374108924f460cbb1937d0c589377015561 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -84,7 +84,20 @@ LIBS = -L$(LDAP_LIBDIR) $(LDAP_LIBS) $(XLIBS) $(AC_LIBS)
 CFLAGS = $(AC_CFLAGS) $(DEFS) $(DEFINES)
 LDFLAGS = $(AC_LDFLAGS)
 
-default:       all
+all:           all-common FORCE
+install:       install-common FORCE
+clean:         clean-common FORCE
+veryclean:     veryclean-common FORCE
+depend:                depend-common FORCE
+
+# empty local rules
+all-local:
+install-local:
+clean-local:
+veryclean-local:
+depend-local:
+lint-local:
+lint5-local:
 
 Makefile: Makefile.in ${top_srcdir}/config.status
        @if [ $(top_srcdir) = $(srcdir) ]; then ; \
@@ -96,3 +109,5 @@ Makefile: Makefile.in ${top_srcdir}/config.status
 
 # empty rule for forcing rules
 FORCE:
+
+##---------------------------------------------------------------------------

diff --git a/configure.in b/configure.in
index 0e7b616e5b7d016ae49d25f876dd4486c04e2ef2..e6a53194cc51f03027a641c4e0296d88e53b9c4c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -348,7 +348,6 @@ dnl AC_OUTPUT( \
 dnl contrib/Makefile:build/top.mk:contrib/Makefile.in:build/dir.mk \
 dnl contrib/saucer/Makefile:build/top.mk:contrib/saucer/Makefile.in:build/rules.mk \
 dnl contrib/whois++/Makefile:build/top.mk:contrib/whois++/Makefile.in:build/rules.mk \
-dnl servers/ldapd/Makefile:build/top.mk:servers/ldapd/Makefile.in:build/srv.mk \
 dnl Makefile:build/top.mk:Makefile.in:build/dir.mk, \
 dnl [date > stamp-h])
 
@@ -371,6 +370,7 @@ libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.
 libraries/liblthread/Makefile:build/top.mk:libraries/liblthread/Makefile.in:build/lib.mk \
 libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk \
 servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk \
+servers/ldapd/Makefile:build/top.mk:servers/ldapd/Makefile.in:build/srv.mk \
 servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \
 servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/srv.mk \
 servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/srv.mk \

diff --git a/include/Makefile.in b/include/Makefile.in
index ee55bb6956d110d035c41edb7fc58d98cf5310bc..b969697e6036a4f4bdd0975597af1b3c70100644 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -3,7 +3,9 @@
 ##
 ## include Makefile.in for OpenLDAP
 
-install: all FORCE
+all-local: ldapconfig.h FORCE
+
+install-local: FORCE
                -$(MKDIR) -p $(includedir)
                $(INSTALL) $(INSTALLFLAGS) -m 644 ldap.h $(includedir)
                $(INSTALL) $(INSTALLFLAGS) -m 644 lber.h $(includedir)
@@ -12,22 +14,22 @@ install: all FORCE
                $(INSTALL) $(INSTALLFLAGS) -m 644 disptmpl.h $(includedir)
                $(INSTALL) $(INSTALLFLAGS) -m 644 srchpref.h $(includedir)
 
-all: ldapconfig.h FORCE
-
-clean: FORCE 
+clean-local: FORCE 
        $(RM) ldapconfig.h
 
-veryclean: clean FORCE
-depend: ldapconfig.h FORCE
+veryclean-local: clean-local FORCE
+
+depend-local: ldapconfig.h FORCE
 
 ldapconfig.h: ldapconfig.h.edit Makefile
        @$(RM) $@
+       @echo "Making ldapconfig.h"
        @echo "/*" > $@;  \
-        echo " * This file was automatically generated.  Do not edit it." >> $@; \
-        echo " * Instead, edit the file ldapconfig.h.edit.  See the LDAP" >> $@; \
-        echo " * INSTALL file for more information." >> $@; \
-        echo " */ " >> $@; \
-        echo "" >> $@; \
+       echo " * This file was automatically generated.  Do not edit it." >> $@; \
+       echo " * Instead, edit the file ldapconfig.h.edit.  See the LDAP" >> $@; \
+       echo " * INSTALL file for more information." >> $@; \
+       echo " */ " >> $@; \
+       echo "" >> $@; \
        $(SED) \
                        -e 's;%SYSCONFDIR%;$(sysconfdir);' \
                        -e 's;%BINDIR%;$(bindir);' \
@@ -40,3 +42,8 @@ ldapconfig.h: ldapconfig.h.edit Makefile
                         ldapconfig.h.edit >> $@; \
        $(CHMOD) 444 $@
 
+all-common:                    all-local
+install-common:                install-local
+clean-common:          clean-local
+veryclean-common:      veryclean-local
+depend-common:         depend-local

diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in
index fe4f007d8a5506a31abbbde49aa4dee267f3748e..bfcfce10939bf706a3c5449cfa8ec5f10e76f725 100644 (file)
--- a/libraries/liblber/Makefile.in
+++ b/libraries/liblber/Makefile.in
@@ -8,7 +8,7 @@ XSRCS = version.c
 
 LIBRARY = liblber.a
 
-install: $(LIBRARY) FORCE
+install-local: $(LIBRARY) FORCE
        -$(MKDIR) -p $(libdir)
        $(INSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
        @(cd /tmp; $(RANLIB) $(libdir)/$(LIBRARY))

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index 7804052c97360846b35041e48c643e120fea05af..a2e2d11762ff1d82cd87978e056deb7ac6d2fe4f 100644 (file)
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -26,7 +26,8 @@ ttest:        $(LIBRARY) tmpltest.o $(LIBLBER)
        $(CC) $(LDFLAGS) -o $@ test.o $(LIBS)
 
 CFFILES= ldapfilter.conf ldapfriendly ldaptemplates.conf ldapsearchprefs.conf
-install: $(LIBRARY) $(CFFILES) FORCE
+
+install-local: $(LIBRARY) $(CFFILES) FORCE
        -$(MKDIR) -p $(libdir)
        $(INSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
        @(cd /tmp; $(RANLIB) $(libdir)/$(LIBRARY))

diff --git a/libraries/libldbm/Makefile.in b/libraries/libldbm/Makefile.in
index 8d66c7d7f7b65b794e2a6d7b7f64cf33a0ad2a40..4ef12dd410a68a7a39b2e0df2cac2bf0c0789920 100644 (file)
--- a/libraries/libldbm/Makefile.in
+++ b/libraries/libldbm/Makefile.in
@@ -1,6 +1,7 @@
 ##
 ## Makefile for -lldbm
 ##
+
 LIBRARY                = libldbm.a
 XPROGRAMS      = testldbm
 SRCS           = ldbm.c

diff --git a/libraries/libldif/Makefile.in b/libraries/libldif/Makefile.in
index 8478ad20ece9a75563458f5c34ba79d6adfa570e..6881b0707c8f4ba4afb37d4ab77e5951625f9ce8 100644 (file)
--- a/libraries/libldif/Makefile.in
+++ b/libraries/libldif/Makefile.in
@@ -1,6 +1,7 @@
 ##
 ## Makefile for -lldif
 ##
+
 LIBRARY        = libldif.a
 SRCS   = line64.c
 OBJS   = line64.o

diff --git a/libraries/liblthread/Makefile.in b/libraries/liblthread/Makefile.in
index 0284949c01762a118b328be382cea2d423103f07..9b12990e6ee2b5b763df6634bba98e165ec06235 100644 (file)
--- a/libraries/liblthread/Makefile.in
+++ b/libraries/liblthread/Makefile.in
@@ -1,6 +1,7 @@
 ##
 ## Makefile for -llthread
 ##
+
 LIBRARY        = liblthread.a
 XSRCS  = version.c
 SRCS   = thread.c stack.c

diff --git a/libraries/liblutil/Makefile.in b/libraries/liblutil/Makefile.in
index 125db2a9267aa151b4dc186e8167d6b13da10326..67e499385ad609107b4a47f9b37f417af2702b92 100644 (file)
--- a/libraries/liblutil/Makefile.in
+++ b/libraries/liblutil/Makefile.in
@@ -1,6 +1,7 @@
 ##
 ## Makefile for -lutil
 ##
+
 LIBRARY        = liblutil.a
 SRCS   = base64.c md5.c sha1.c
 OBJS   = base64.o md5.o sha1.o

diff --git a/servers/ldapd/Makefile.in b/servers/ldapd/Makefile.in
new file mode 100644 (file)
index 0000000..8a7d913
--- /dev/null
+++ b/servers/ldapd/Makefile.in
@@ -0,0 +1,49 @@
+##
+## Makefile.in for ldapd
+##
+PROGRAMS=ldapd
+XPROGRAMS=sldapd
+SRCS   = main.c detach.c setproctitle.c request.c bind.c result.c error.c \
+       search.c util.c compare.c message.c add.c delete.c modrdn.c modify.c \
+       abandon.c syntax.c association.c kerberos.c certificate.c
+OBJS   = main.o detach.o setproctitle.o request.o bind.o result.o error.o \
+       search.o util.o compare.o message.o add.o delete.o modrdn.o modify.o \
+       abandon.o syntax.o association.o kerberos.o LDAP_tables.o \
+       certificate.o
+
+BUILD_OPT = "--enable-ldapd"
+BUILD_SRV = @BUILD_LDAPD@
+
+XDEFS= @LDAPD_DEFS@
+XLIBS= @LDAPD_LIBS@
+
+all-local: $(PROGRAMS)
+
+ldapd: version.o
+       $(CC) $(LDFLAGS) -o $@ $(OBJS) version.o $(LIBS)
+
+sldapd:        version.o
+       $(CC) $(LDFLAGS) -static -o $@ $(OBJS) version.o $(LDFLAGS) $(LIBS) -lresolv
+
+version.c: $(OBJS) $(LDIR)/liblber/liblber.a
+       $(RM) $@
+       (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+        t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
+       -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
+       -e "s|%VERSION%|$${v}|" \
+       < Version.c > $@)
+
+request.o:     LDAP-types.h
+
+LDAP_tables.c: ldap.py
+       @if [ ! -z "$(PEPSY)" ]; then \
+           $(PEPSY) -A ldap.py; \
+       else \
+           touch LDAP_tables.c LDAP-types.h; \
+       fi
+
+LDAP-types.h: LDAP_tables.c
+
+install-local: FORCE
+       @$(MKDIR) -p $(libexecdir)
+       $(INSTALL) $(INSTALLFLAGS) -m 755 ldapd $(LDAP_LIBEXECDIR)

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 6def4530b9ad951ebcea76594c189286a958db15..b057e0136e2eb18617f112f5fb6f8d4581b227d9 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -21,7 +21,7 @@ OBJS  = main.o daemon.o connection.o search.o filter.o add.o charray.o \
 BUILD_OPT = "--enable-slapd"
 BUILD_SRV = @BUILD_SLAPD@
 
-all-srv: FORCE
+all-local: FORCE
        $(MAKE) $(MFLAGS) backendslib
        $(MAKE) $(MFLAGS) slapd
        (cd tools; $(MAKE) $(MFLAGS) all)
@@ -79,7 +79,7 @@ version.c: libbackends.a $(OBJS) \
        -e "s|%VERSION%|$${v}|" \
        < Version.c > $@)
 
-clean: FORCE
+clean-local: FORCE
        @for i in back-* tools; do \
                if [ -d $$i ] ; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
@@ -87,7 +87,7 @@ clean: FORCE
                fi; \
        done
 
-install: install-slapd install-conf install-tools
+install-local: install-slapd install-conf install-tools
 
 install-slapd: FORCE
        @-$(MKDIR) $(libexecdir)

diff --git a/servers/slapd/back-ldbm/Makefile.in b/servers/slapd/back-ldbm/Makefile.in
index 7990b594d0094ab20ccb05b0623063dabfce1c55..4098c22e091458876c522da6a2b977970e5c4748 100644 (file)
--- a/servers/slapd/back-ldbm/Makefile.in
+++ b/servers/slapd/back-ldbm/Makefile.in
@@ -15,7 +15,7 @@ XDEFS = @LDBM_DEFS@ @LTHREAD_DEFS@
 
 PROGRAMS = libback-ldbm.a
 
-all-srv: FORCE
+all-local: FORCE
        $(MAKE) $(MFLAGS) libback-ldbm.a
 
 libback-ldbm.a:        version.o

diff --git a/servers/slapd/back-passwd/Makefile.in b/servers/slapd/back-passwd/Makefile.in
index 51a7ee3b68bdfc97710f8b3ef0bf6e59e5ed5a70..2552ead44c2ccd0dc9e236f682167168187c35bd 100644 (file)
--- a/servers/slapd/back-passwd/Makefile.in
+++ b/servers/slapd/back-passwd/Makefile.in
@@ -8,7 +8,7 @@ PROGRAMS= libback-passwd.a
 XINCLUDEDIR= -I..
 XDEFS = @LTHREAD_DEFS@
 
-all-srv:       FORCE   
+all-local:     FORCE   
        $(MAKE) $(MFLAGS) libback-passwd.a
 
 libback-passwd.a:      version.o

diff --git a/servers/slapd/back-shell/Makefile.in b/servers/slapd/back-shell/Makefile.in
index f025422c21a9527c1cf07fd0bb27f8186e9b0632..34a57e9b670bf8e76baa229d8ef92943f51ee1df 100644 (file)
--- a/servers/slapd/back-shell/Makefile.in
+++ b/servers/slapd/back-shell/Makefile.in
@@ -10,7 +10,7 @@ PROGRAMS =            libback-shell.a
 XINCLUDEDIR =  -I..
 XDEFS = @LTHREAD_DEFS@
 
-all-srv:       FORCE
+all-local:     FORCE
        $(MAKE) $(MFLAGS) libback-shell.a
 
 libback-shell.a:       version.o

diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
index 20b239d1e2567c21b4b1329fcc7973d5ca7cec06..912aa07a514af2b723600d90b253cb6d032044e7 100644 (file)
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@@ -15,6 +15,12 @@
 HAVE_ISODE = @HAVE_ISODE@
 BUILD_LDBM = @BUILD_LDBM@
 
+PROGRAMS=ldif2index ldif2ldbm ldbmcat ldif2id2entry \
+       ldif2id2children centipede ldbmtest ldif
+
+SRCS = centipede.c ldbmcat.c ldbmtest.c sizecount.c \
+       ldif.c ldif2id2children.c ldif2id2entry.c ldif2index.c ldif2ldbm.c
+
 EDB2LDIFSRCS   = edb2ldif.c ldapsyntax.c
 EDB2LDIFOBJS   = edb2ldif.o ldapsyntax.o ../strdup.o
 
@@ -24,18 +30,17 @@ OBJS2       = ../config.o ../ch_malloc.o ../backend.o ../charray.o \
                ../dn.o ../filter.o ../str2filter.o ../ava.o ../init.o \
                ../schemaparse.o ../strdup.o
 
-all:   build-edb2ldif ldif2index ldif2ldbm ldbmcat ldif2id2entry \
-               ldif2id2children centipede ldbmtest ldif
+all-local: build-edb2ldif build-chlog2replog $(PROGRAMS)
 
 XDEFS = @SLAPD_DEFS@ @LDBM_DEFS@ @LTHREAD_DEFS@
 XLIBS = @SLAPD_LIBS@ -lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@
 
 build-edb2ldif:        FORCE
        @if [ "$(HAVE_ISODE)" = "yes" ]; then \
-               $(MAKE) $(MFLAGS) edb2ldif; \
-        else \
-            echo "run configure with --with-isode to build edb2ldif"; \
-        fi
+               $(MAKE) $(MFLAGS) edb2ldif; \
+    else \
+               echo "run configure with --with-isode to build edb2ldif"; \
+    fi
 
 edb2ldif:      edb2-vers.o
        $(CC) $(LDFLAGS) -o $@ $(EDB2LDIFOBJS) edb2-vers.o $(LIBS)
@@ -50,10 +55,10 @@ edb2-vers.c: $(EDB2LDIFOBJS)
 
 build-chlog2replog: FORCE
        @if [ "$(HAVE_ISODE)" = "yes" ]; then \
-               $(MAKE) $(MFLAGS) chlog2replog; \
-        else \
-            echo "run configure with --with-isode to build chlog2replog"; \
-        fi
+               $(MAKE) $(MFLAGS) chlog2replog; \
+       else \
+               echo "run configure with --with-isode to build chlog2replog"; \
+       fi
 
 chlog2replog: chlog2replog.o ../lock.o ../ch_malloc.o
        $(CC) $(LDFLAGS) -o $@ chlog2replog.o ../lock.o ../ch_malloc.o $(LIBS)
@@ -86,70 +91,37 @@ sizecount:  sizecount.o ../phonetic.o ../ch_malloc.o
 ldbmtest:      ldbmtest.o ../libbackends.a $(OBJS2)
        $(CC) $(LDFLAGS) -o ldbmtest ldbmtest.o $(OBJS2) ../libbackends.a $(LIBS)
 
-install: $(sbindir) $(sbindir)/edb2ldif $(sbindir)/ldif2ldbm \
-       $(sbindir)/ldif2index $(sbindir)/ldif2id2entry \
-       $(sbindir)/ldif2id2children $(sbindir)/ldbmcat \
-       $(sbindir)/centipede $(sbindir)/ldbmtest \
-       $(sbindir)/ldif
-
-$(sbindir)/edb2ldif:   build-edb2ldif
-       @if [ "$(HAVE_ISODE)" = "yes" ]; then \
-               $(INSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(sbindir); \
-       else \
-               exit 0; \
-       fi
+clean-local: FORCE
+       $(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) edb2-vers.c *.o a.out core
 
-$(sbindir)/chlog2replog:       build-chlog2replog
+depend-local: FORCE
        @if [ "$(HAVE_ISODE)" = "yes" ]; then \
-               $(INSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(sbindir); \
-       else \
-               exit 0; \
-       fi
+        DEPENDEXTRAS="$(ISODEINCLUDEFLAG) chlog2replog.c $(EDB2LDIFSRCS)"; \
+    fi; \
+    $(MKDEP) $(DEFS) $(DEFINES) $$DEPENDEXTRAS $(SRCS)
 
-$(sbindir)/ldif2ldbm:  ldif2ldbm
+install-local: install-isode FORCE
+       @-$(MKDIR) -p $(sbindir)
        $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(sbindir)
-
-$(sbindir)/ldif2index: ldif2index
        $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(sbindir)
-
-$(sbindir)/ldif2id2entry:      ldif2id2entry
        $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(sbindir)
-
-$(sbindir)/ldif2id2children:   ldif2id2children
        $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(sbindir)
-
-$(sbindir)/ldbmcat:    ldbmcat
        $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(sbindir)
-
-$(sbindir)/ldif:       ldif
        $(INSTALL) $(INSTALLFLAGS) -m 755 ldif $(sbindir)
-
-$(sbindir)/centipede:  centipede
        $(INSTALL) $(INSTALLFLAGS) -m 755 centipede $(sbindir)
-
-$(sbindir)/ldbmtest:   ldbmtest
        $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(sbindir)
 
-lint:  FORCE
-       $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)
-
-5lint: FORCE
-       $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS)
-
-clean: FORCE
-       @echo "making clean in `$(PWD)`"
-       $(RM) edb2ldif ldif2index *.o core a.out edb2-vers.c \
-               ldif2ldbm ldif2id2entry ldif2id2children ldbmcat ldif \
-               centipede chlog2replog sizecount ldif2ldbm.sed.c ldbmtest
-
-depend:        ldif2ldbm.sed.c FORCE
-       @if [ ! -z "$(HAVE_ISODE)" ]; then \
-           DEPENDEXTRAS="$(ISODEINCLUDEFLAG) chlog2replog.c $(EDB2LDIFSRCS)"; \
-       fi; \
-       $(MKDEP) $(INCLUDES) $(DEFINES) $$DEPENDEXTRAS ldif2index.c \
-           ldif2ldbm.c ldif2id2entry.c ldif2id2children.c ldbmcat.c \
-           centipede.c sizecount.c ldif2ldbm.sed.c ldbmtest.c ldif.c
-
-links:
-       @echo "making links in `$(PWD)`"
-       @$(LN) .src/*.[ch] .
+install-isode: FORCE
+       @-$(MKDIR) -p $(sbindir)
+       @if [ "$(HAVE_ISODE)" = "yes" ]; then \
+               $(INSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(sbindir); \
+               $(INSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(sbindir); \
+       else \
+               exit 0; \
+       fi
+
+all-common: all-local FORCE
+install-common: all-common install-local FORCE
+depend-common: depend-local FORCE
+clean-common: clean-local FORCE
+veryclean-common: clean-common veryclean-local FORCE

diff --git a/servers/slurpd/Makefile.in b/servers/slurpd/Makefile.in
index b3c7a9da078322af8db435fbc63dcdd3757a31ef..4c1c4233f407b67058fcd30e0f3c1ba8af8f1236 100644 (file)
--- a/servers/slurpd/Makefile.in
+++ b/servers/slurpd/Makefile.in
@@ -15,7 +15,7 @@ OBJS  =       admin.o args.o ch_malloc.o config.o detach.o \
 BUILD_OPT = "--enable-slurpd"
 BUILD_SRV = @BUILD_SLURPD@
 
-all-srv:       slurpd
+all-local:     slurpd
 
 XDEFS = @SLURPD_DEFS@ @LTHREAD_DEFS@
 XLIBS = @SLURPD_LIBS@ -llthread @LTHREAD_LIBS@
@@ -31,6 +31,6 @@ version.c: $(OBJS) $(LDAP_LIBDIR)/liblber.a $(LDAP_LIBDIR)/libldap.a
        -e "s|%VERSION%|$${v}|" \
        < Version.c > $@)
 
-install: install-srv FORCE
+install-local: FORCE
        @-$(MKDIR) -p $(libexecdir)
        $(INSTALL) $(INSTALLFLAGS) -m 755 slurpd $(libexecdir)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 00c45b62d5b51788ce1b67fd9e8c67f9f7007aa2..5965bd6d15504f438da655b954a4861a0ec29b9f 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -6,14 +6,22 @@
 
 SCRIPTSDIR=./scripts
 
-all:   FORCE
+all-local:     FORCE
        @echo "Initiating LDAP tests..."; \
        $(MKDIR) -p test-db test-repl ; \
        $(SCRIPTSDIR)/all $(SCRIPTSDIR)
 
-install:       FORCE
-depend:        FORCE
-veryclean:     clean
-
-clean: FORCE
+clean-local:   FORCE
        $(RM) test-db/[!C]* test-repl/[!C]* *core
+
+veryclean-local:       clean
+
+depend-local:  FORCE
+
+install-local: FORCE
+
+all-common:                    all-local
+install-common:                install-local
+clean-common:          clean-local
+veryclean-common:      veryclean-local
+depend-common:         depend-local