Fix server --without-xxx build issues...

build/srv.mk

@@ -41,22 +41,29 @@ install-common: FORCE
 		echo "run configure with $(BUILD_OPT) to install $(PROGRAMS)"; \
 	fi
 
-all-srv: FORCE
+all-local-srv:
+all-srv: all-local-srv FORCE
 
-install-srv: FORCE
+install-local-srv:
+install-srv: install-local-srv FORCE
 
-lint-srv: FORCE
+lint-local-srv:
+lint-srv: lint-local-srv FORCE
 	$(LINT) $(DEFS) $(DEFINES) $(SRCS)
 
-5lint-srv: FORCE
+5lint-local-srv:
+5lint-srv: 5lint-local-srv FORCE
 	$(5LINT) $(DEFS) $(DEFINES) $(SRCS)
 
-clean-srv: 	FORCE
+clean-local-srv:
+clean-srv: 	clean-local-srv FORCE
 	$(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) *.o a.out core .libs/*
 
-depend-srv: FORCE
+depend-local-srv:
+depend-srv: depend-local-srv FORCE
 	$(MKDEP) $(DEFS) $(DEFINES) $(SRCS)
 
-veryclean-srv: 	clean-srv
+veryclean-local-srv:
+veryclean-srv: 	clean-srv veryclean-local-srv
 
 Makefile: $(top_srcdir)/build/srv.mk

servers/ldapd/Makefile.in

@@ -45,6 +45,6 @@ LDAP_tables.c:	ldap.py
 
 LDAP-types.h: LDAP_tables.c
 
-install-srv: FORCE
+install-local-srv: FORCE
 	@$(MKDIR) $(libexecdir)
 	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapd $(LDAP_LIBEXECDIR)

servers/slapd/Makefile.in

@@ -25,7 +25,7 @@ LDAP_LIBDIR= ../../libraries
 BUILD_OPT = "--enable-slapd"
 BUILD_SRV = @BUILD_SLAPD@
 
-all-local: FORCE
+all-local-srv: FORCE
 	$(MAKE) $(MFLAGS) backendslib
 	$(MAKE) $(MFLAGS) slapd
 	(cd tools; $(MAKE) $(MFLAGS) all)
@@ -86,7 +86,7 @@ version.c: libbackends.a $(OBJS) $(LDAP_LIBDEPEND) \
 	-e "s|%VERSION%|$${v}|" \
 	< $(srcdir)/Version.c > $@)
 
-depend-local: FORCE
+depend-local-srv: FORCE
 	@for i in back-* shell-backends tools; do \
 		if [ -d $$i ]; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
@@ -94,7 +94,7 @@ depend-local: FORCE
 		fi; \
 	done
 
-clean-local: FORCE
+clean-local-srv: FORCE
 	@for i in back-* shell-backends tools; do \
 		if [ -d $$i ]; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
@@ -102,15 +102,7 @@ clean-local: FORCE
 		fi; \
 	done
 
-veryclean-local: FORCE
-	@for i in back-* shell-backends tools; do \
-		if [ -d $$i ]; then \
-			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) veryclean"; \
-			( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \
-		fi; \
-	done
-
-install-local: install-slapd install-conf install-tools
+install-local-srv: install-slapd install-conf install-tools
 
 install-slapd: FORCE
 	@-$(MKDIR) $(libexecdir)

servers/slapd/back-ldbm/Makefile.in

@@ -18,7 +18,7 @@ XINCPATH = -I.. -I$(srcdir)/..
 
 PROGRAMS = libback-ldbm.a
 
-all-local: FORCE
+all-local-srv: FORCE
 	$(MAKE) $(MFLAGS) libback-ldbm.a
 
 libback-ldbm.a:	version.o

servers/slapd/back-passwd/Makefile.in

@@ -12,7 +12,7 @@ PROGRAMS= libback-passwd.a
 
 XINCPATH = -I.. -I$(srcdir)/..
 
-all-local: 	FORCE	
+all-local-srv: 	FORCE	
 	$(MAKE) $(MFLAGS) libback-passwd.a
 
 libback-passwd.a:	version.o

servers/slapd/back-shell/Makefile.in

@@ -14,7 +14,7 @@ PROGRAMS =		libback-shell.a
 
 XINCPATH = -I.. -I$(srcdir)/..
 
-all-local:	FORCE
+all-local-srv:	FORCE
 	$(MAKE) $(MFLAGS) libback-shell.a
 
 libback-shell.a:	version.o

servers/slapd/shell-backends/Makefile.in

@@ -10,7 +10,7 @@ LDAP_LIBDIR= ../../../libraries
 BUILD_OPT = "--enable-shell"
 BUILD_SRV = @BUILD_SHELL@
 
-all-local: $(PROGRAMS)
+all-local-srv: $(PROGRAMS)
 
 passwd-shell:	pwd-version.o
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) pwd-version.o $(LIBS)

servers/slapd/tools/Makefile.in

@@ -122,7 +122,7 @@ depend-local: FORCE
 	if [ "$$DEPEND" = "yes" ]; then \
     	$(MKDEP) $(DEFS) $(DEFINES) $$DEPEND_ISODE $$DEPEND_LDBM; \
 	else \
-		exit 0; \
+		echo "slapd-tools: no dependencies to make"; \
 	fi
 
 install-local: install-ldbm install-isode FORCE

servers/slurpd/Makefile.in

@@ -40,6 +40,6 @@ version.c: $(OBJS) $(LDAP_LIBDEPEND)
 	-e "s|%VERSION%|$${v}|" \
 	< $(srcdir)/Version.c > $@)
 
-install-local: FORCE
+install-local-srv: FORCE
 	@-$(MKDIR) $(libexecdir)
 	$(LTINSTALL) $(INSTALLFLAGS) -m 755 slurpd $(libexecdir)