Update build environment with changes from -devel, including:

	--without-"server-component" fixes
	make clean in shared libraries directories

diff --git a/build/lib.mk b/build/lib.mk
index a56086fb5275fd86c1ba8b2189c563b0d8b03ccf..d92d72503dfcf316ddec72a88bf27a68cfcbc1df 100644 (file)
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -22,7 +22,8 @@ lint5: lint5-local FORCE
        $(5LINT) $(DEFS) $(DEFINES) $(SRCS)
 
 clean-common:  FORCE
-       $(RM) $(LIBRARY) ../$(LIBRARY) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) \
+       $(RM) $(LIBRARY) ../$(LIBRARY) $(XLIBRARY) \
+               $(PROGRAMS) $(XPROGRAMS) $(XSRCS) \
                *.o *.lo a.out core version.c .libs/*
 
 depend-common: FORCE

diff --git a/build/ltconfig b/build/ltconfig
index b746287cd2f19c2bf5954ad00fb0b3845a922151..729792ddb5ad02d292a8e8c4f45a34a9513f5cf3 100755 (executable)
--- a/build/ltconfig
+++ b/build/ltconfig
@@ -541,7 +541,7 @@ if test -n "$pic_flag"; then
   # Check to make sure the pic_flag actually works.
   echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
   $rm conftest*
-  echo > conftest.c
+  echo "int __my_integer = 0" \; > conftest.c
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $pic_flag -DPIC"
   echo "$progname:547: checking if $compiler PIC flag $pic_flag works" >&5
@@ -1133,8 +1133,8 @@ freebsd2*)
 freebsd3*)
   version_type=freebsd
   library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-  if [ $PORTOBJFORMAT = elf ]; then
-  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
+  if [ -x `/usr/bin/objformat` ]; then
+  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT=`objformat` ldconfig -m $libdir'
   else
   finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
   fi

diff --git a/build/srv.mk b/build/srv.mk
index 6f1ad9637b870247dae840c9b04b3cc705dc5598..5b4e373da92b9ecc2f92ab69d2d7468335feea79 100644 (file)
--- 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/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in
index 4d6754ee944e9c00ec9fa52cc9eb32699e2d5acc..1c0bfcb79b7a9339ba346e2b2038950150c7561b 100644 (file)
--- a/libraries/liblber/Makefile.in
+++ b/libraries/liblber/Makefile.in
@@ -3,6 +3,7 @@
 ##
 
 LIBRARY = liblber.la
+XLIBRARY = ../liblber.a
 
 SRCS= decode.c encode.c io.c bprint.c
 OBJS= decode.lo encode.lo io.lo bprint.lo

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index 4a3f9383f99e09ee679e2641c073cbe512f52072..ba5255cb6c82e898023cc0ddc77345118235a949 100644 (file)
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -2,6 +2,7 @@
 ## Makefile.in for LDAP -lldap
 ##
 LIBRARY = libldap.la
+XLIBRARY = ../libldap.a
 PROGRAMS = ltest ttest
 
 SRCS   = bind.c open.c result.c error.c compare.c search.c \

diff --git a/servers/ldapd/Makefile.in b/servers/ldapd/Makefile.in
index cd683ae16e005de6fb8fd7a770f6e7e7e424a691..23a7c1e082eb22c28c7a945aa1c1acca4160f43a 100644 (file)
--- 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 adace7035dba70d5d56bf5f8a75b83edd1753e10..059c8f2b18d4cee9858724b37c686d72cad7e3f0 100644 (file)
--- 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 7e6d2f508ce03fe96cde54d9fde36f8b1843819e..985149e9d9b1819534c9f5a1bed15bcc7aae92da 100644 (file)
--- 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 339dc9ebf002d75a9e6569202dae18e1e4241f79..24d620b103183f10b2492690f390b801e12741d2 100644 (file)
--- 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 58291f2aae71b74d7d0fc706e8ddc3907a63f4e8..d17e442cb49d0311fe99db2de8f04efc90853079 100644 (file)
--- 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
new file mode 100644 (file)
index 0000000..75064b3
--- /dev/null
+++ b/servers/slapd/shell-backends/Makefile.in
@@ -0,0 +1,24 @@
+PROGRAMS = passwd-shell
+
+SRCS = passwd-shell.c shellutil.c
+XSRCS = pwd-version.c
+OBJS = passwd-shell.o shellutil.o
+
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
+
+BUILD_OPT = "--enable-shell"
+BUILD_SRV = @BUILD_SHELL@
+
+all-local-srv: $(PROGRAMS)
+
+passwd-shell:  pwd-version.o
+       $(CC) $(LDFLAGS) -o $@ $(OBJS) pwd-version.o $(LIBS)
+
+pwd-version.c: $(OBJS) $(LDAP_LIBDEPEND)
+       $(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}|" \
+       < $(srcdir)/pwd-Version.c > $@)

diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
index 2608b754720c25e1cccfec229c76069ee31d6a53..2045682f6f9bf831523d10145b89914999c635af 100644 (file)
--- 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 0c70980d141c498d84b8829d8edcfa27b228d31b..a7db275d3113acd50140de1d40324ea4639d3fb3 100644 (file)
--- 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)