From 4123a08af5d958a8b6f2a0a36f712b882396e836 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sun, 20 Dec 1998 00:55:39 +0000 Subject: [PATCH] Fix server --without-xxx build issues... --- build/srv.mk | 21 ++++++++++++++------- servers/ldapd/Makefile.in | 2 +- servers/slapd/Makefile.in | 16 ++++------------ servers/slapd/back-ldbm/Makefile.in | 2 +- servers/slapd/back-passwd/Makefile.in | 2 +- servers/slapd/back-shell/Makefile.in | 2 +- servers/slapd/shell-backends/Makefile.in | 2 +- servers/slapd/tools/Makefile.in | 2 +- servers/slurpd/Makefile.in | 2 +- 9 files changed, 25 insertions(+), 26 deletions(-) diff --git a/build/srv.mk b/build/srv.mk index 6f1ad9637b..5b4e373da9 100644 --- a/build/srv.mk +++ b/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 diff --git a/servers/ldapd/Makefile.in b/servers/ldapd/Makefile.in index cd683ae16e..23a7c1e082 100644 --- a/servers/ldapd/Makefile.in +++ b/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) diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index adace7035d..059c8f2b18 100644 --- a/servers/slapd/Makefile.in +++ b/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) diff --git a/servers/slapd/back-ldbm/Makefile.in b/servers/slapd/back-ldbm/Makefile.in index 7e6d2f508c..985149e9d9 100644 --- a/servers/slapd/back-ldbm/Makefile.in +++ b/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 diff --git a/servers/slapd/back-passwd/Makefile.in b/servers/slapd/back-passwd/Makefile.in index 339dc9ebf0..24d620b103 100644 --- a/servers/slapd/back-passwd/Makefile.in +++ b/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 diff --git a/servers/slapd/back-shell/Makefile.in b/servers/slapd/back-shell/Makefile.in index 58291f2aae..d17e442cb4 100644 --- a/servers/slapd/back-shell/Makefile.in +++ b/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 diff --git a/servers/slapd/shell-backends/Makefile.in b/servers/slapd/shell-backends/Makefile.in index 8789dede37..75064b3404 100644 --- a/servers/slapd/shell-backends/Makefile.in +++ b/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) diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in index 2608b75472..2045682f6f 100644 --- a/servers/slapd/tools/Makefile.in +++ b/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 diff --git a/servers/slurpd/Makefile.in b/servers/slurpd/Makefile.in index 0c70980d14..a7db275d31 100644 --- a/servers/slurpd/Makefile.in +++ b/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) -- 2.39.5