shlib-updates-20020909

based on reports from nneul@umr.edu

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

fix dest for real

====================

based on reports from nneul@umr.edu

====================

based on reports from nneul@umr.edu

====================

fix link lines for real

====================

install everything in toplibdir

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index d229ac2..1185d1e 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -640,6 +640,7 @@ AC_SUBST(REGEX_OBJ)
 AC_SUBST(RM)
 AC_SUBST(SHLIB_CFLAGS)
 AC_SUBST(SHLIB_LDFLAGS)
+AC_SUBST(SHLIB_LINKER)
 AC_SUBST(SHLIB_SUFFIX)
 AC_SUBST(TXLIBS)
 AC_SUBST(VFSCK_CFLAGS)

diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index b92c828..694203a 100644 (file)
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -58,6 +58,7 @@ REGEX_OBJ = @REGEX_OBJ@
 RM = @RM@
 SHLIB_CFLAGS = @SHLIB_CFLAGS@
 SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
+SHLIB_LINKER = @SHLIB_LINKER@
 SHLIB_SUFFIX = @SHLIB_SUFFIX@
 SYS_NAME = @AFS_SYSNAME@
 TOP_INCDIR = @TOP_INCDIR@

diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in
index 522afd1..a72ac8e 100644 (file)
--- a/src/shlibafsauthent/Makefile.in
+++ b/src/shlibafsauthent/Makefile.in
@@ -97,22 +97,24 @@ LIBOBJS = \
 
 LIBAFSAUTHENT = libafsauthent.${SHLIB_SUFFIX}.${LIBAFSAUTHENTMAJOR}.${LIBAFSAUTHENTMINOR}
 
-${DEST}${libdir}/libafsauthent.${SHLIB_SUFFIX}: ${LIBAFSAUTHENT}
-        ${INSTALL} ${LIBAFSAUTHENT} ${DEST}${libdir}/${LIBAFSAUTHENT}
-        -ln -f -s ${LIBAFSAUTHENT} ${DEST}${libdir}/libafsauthent.${SHLIB_SUFFIX}
+${DEST}/lib/${LIBAFSAUTHENT}: ${LIBAFSAUTHENT}
+       ${INSTALL} ${LIBAFSAUTHENT} ${DEST}/lib/${LIBAFSAUTHENT}
 
-all: ${TOP_LIBDIR}/${LIBAFSAUTHENT}
+${DEST}/lib/libafsauthent.${SHLIB_SUFFIX}: ${DEST}/lib/${LIBAFSAUTHENT}
+       -ln -f -s ${LIBAFSAUTHENT} ${DEST}/lib/libafsauthent.${SHLIB_SUFFIX}
 
-install: ${DESTDIR}${libdir}/${LIBAFSAUTHENT}
+all: ${TOP_LIBDIR}/${LIBAFSAUTHENT} ${TOP_LIBDIR}/libafsauthent.${SHLIB_SUFFIX}
+
+install: ${DESTDIR}${libdir}/${LIBAFSAUTHENT} ${DESTDIR}${libdir}/libafsauthent.${SHLIB_SUFFIX}
 
 ${LIBAFSAUTHENT}: ${LIBOBJS}
        case ${SYS_NAME} in \
        rs_aix4*) \
                ${SHLIB_LINKER} -o ${LIBAFSAUTHENT} ${LIBOBJS} -L${TOP_LIBDIR} -bE:afsauthent.exp -lafsrpc ${MT_LIBS};; \
        sun*_5*) \
-               ${SHLIB_LINKER} -h ${LIBAFSAUTHENT} -o ${LIBAFSAUTHENT} -L${TOP_LIBDIR} -lafsrpc ${MT_LIBS};; \
+               ${SHLIB_LINKER} -h ${LIBAFSAUTHENT} -o ${LIBAFSAUTHENT} ${LIBOBJS} -L${TOP_LIBDIR} -lafsrpc ${MT_LIBS};; \
        *) \
-               ${SHLIB_LINKER} -o ${LIBAFSAUTHENT} -L${TOP_LIBDIR} -lafsrpc ${MT_LIBS};; \
+               ${SHLIB_LINKER} -o ${LIBAFSAUTHENT} ${LIBOBJS} -L${TOP_LIBDIR} -lafsrpc ${MT_LIBS};; \
        esac
 
 audit.o: ${AUDIT}/audit.c
@@ -254,13 +256,18 @@ rmtsysnet.o: ${SYS}/rmtsysnet.c
 clean:
        $(RM) -f *.o *.a libafsauthent*
 
-${DESTDIR}${libdir}/libafsauthent.${SHLIB_SUFFIX}: ${LIBAFSAUTHENT}
-        ${INSTALL} ${LIBAFSAUTHENT} ${DESTDIR}${libdir}/${LIBAFSAUTHENT}
-        -ln -f -s ${LIBAFSAUTHENT} ${DESTDIR}${libdir}/libafsauthent.${SHLIB_SUFFIX}
+${DESTDIR}${libdir}/${LIBAFSAUTHENT}: ${LIBAFSAUTHENT}
+       ${INSTALL} ${LIBAFSAUTHENT} ${DESTDIR}${libdir}/${LIBAFSAUTHENT}
+
+${DESTDIR}${libdir}/libafsauthent.${SHLIB_SUFFIX}: ${DESTDIR}${libdir}/${LIBAFSAUTHENT}
+       -ln -f -s ${LIBAFSAUTHENT} ${DESTDIR}${libdir}/libafsauthent.${SHLIB_SUFFIX}
+
+${TOP_LIBDIR}/${LIBAFSAUTHENT}: ${LIBAFSAUTHENT}
+       ${INSTALL} ${LIBAFSAUTHENT} ${TOP_LIBDIR}/${LIBAFSAUTHENT}
+
+${TOP_LIBDIR}/libafsauthent.${SHLIB_SUFFIX}: ${TOP_LIBDIR}/${LIBAFSAUTHENT}
+       -ln -f -s ${LIBAFSAUTHENT} ${TOP_LIBDIR}/libafsauthent.${SHLIB_SUFFIX}
 
-${TOP_LIBDIR}/libafsauthent.${SHLIB_SUFFIX}: ${LIBAFSAUTHENT}
-        ${INSTALL} ${LIBAFSAUTHENT} ${TOP_LIBDIR}/${LIBAFSAUTHENT}
-        -ln -f -s ${LIBAFSAUTHENT} ${TOP_LIBDIR}/libafsauthent.${SHLIB_SUFFIX}
+dest: ${DEST}/lib/${LIBAFSAUTHENT} ${DEST}/lib/libafsauthent.${SHLIB_SUFFIX}
 
-dest: ${DEST}/lib/${LIBAFSAUTHENT}
 

diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 9bcc967..75dbef1 100644 (file)
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -119,22 +119,24 @@ LIBOBJS = \
 
 LIBAFSRPC = libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR}.${LIBAFSRPCMINOR}
 
-all: ${TOP_LIBDIR}/${LIBAFSRPC}
+all: ${TOP_LIBDIR}/${LIBAFSRPC} ${TOP_LIBDIR}/libafsrpc.${SHLIB_SUFFIX}
 
-install: ${DESTDIR}${libdir}/${LIBAFSRPC}
+install: ${DESTDIR}${libdir}/${LIBAFSRPC} ${DESTDIR}${libdir}/libafsrpc.${SHLIB_SUFFIX}
 
-${DEST}${libdir}/libafsrpc.${SHLIB_SUFFIX}: ${LIBAFSRPC}
-       ${INSTALL} ${LIBAFSRPC} ${DEST}${libdir}/${LIBAFSRPC}
-       -ln -f -s ${LIBAFSRPC} ${DEST}${libdir}/libafsrpc.${SHLIB_SUFFIX}
+${DEST}/lib/${LIBAFSRPC}: ${LIBAFSRPC}
+       ${INSTALL} ${LIBAFSRPC} ${DEST}/lib/${LIBAFSRPC}
+
+${DEST}/lib/libafsrpc.${SHLIB_SUFFIX}: ${DEST}/lib/${LIBAFSRPC}
+       -ln -f -s ${LIBAFSRPC} ${DEST}/lib/libafsrpc.${SHLIB_SUFFIX}
 
 ${LIBAFSRPC}: ${LIBOBJS}
        case ${SYS_NAME} in \
        rs_aix4*) \
                ${SHLIB_LINKER} -o ${LIBAFSRPC} ${LIBOBJS} -bE:afsrpc.exp ${MT_LIBS};; \
        sun*_5*) \
-               ${SHLIB_LINKER} -h ${LIBAFSRPC} -o ${LIBAFSRPC} ${MT_LIBS};; \
+               ${SHLIB_LINKER} -h ${LIBAFSRPC} -o ${LIBAFSRPC} ${LIBOBJS} ${MT_LIBS};; \
        *) \
-               ${SHLIB_LINKER} -o ${LIBAFSRPC} ${MT_LIBS};; \
+               ${SHLIB_LINKER} -o ${LIBAFSRPC} ${LIBOBJS} ${MT_LIBS};; \
        esac
 
 rx_event.o: ${RX}/rx_event.c
@@ -375,13 +377,17 @@ afsaux.o: ${FSINT}/afsaux.c
 clean:
        $(RM) -f *.o libafsrpc*
 
-${DESTDIR}${libdir}/libafsrpc.${SHLIB_SUFFIX}: ${LIBAFSRPC}
+${DESTDIR}${libdir}/${LIBAFSRPC}: ${LIBAFSRPC}
        ${INSTALL} ${LIBAFSRPC} ${DESTDIR}${libdir}/${LIBAFSRPC}
+
+${DESTDIR}${libdir}/libafsrpc.${SHLIB_SUFFIX}: ${DESTDIR}${libdir}/${LIBAFSRPC}
        -ln -f -s ${LIBAFSRPC} ${DESTDIR}${libdir}/libafsrpc.${SHLIB_SUFFIX}
 
-${TOP_LIBDIR}/libafsrpc.${SHLIB_SUFFIX}: ${LIBAFSRPC}
+${TOP_LIBDIR}/${LIBAFSRPC}: ${LIBAFSRPC}
        ${INSTALL} ${LIBAFSRPC} ${TOP_LIBDIR}/${LIBAFSRPC}
+
+${TOP_LIBDIR}/libafsrpc.${SHLIB_SUFFIX}: ${TOP_LIBDIR}/${LIBAFSRPC}
        -ln -f -s ${LIBAFSRPC} ${TOP_LIBDIR}/libafsrpc.${SHLIB_SUFFIX}
 
-dest: ${DEST}/lib/${LIBAFSRPC}
+dest: ${DEST}/lib/${LIBAFSRPC} ${DEST}/lib/libafsrpc.${SHLIB_SUFFIX}
 

diff --git a/src/shlibafsrpc/mapfile b/src/shlibafsrpc/mapfile
index ab29840..87efe93 100644 (file)
--- a/src/shlibafsrpc/mapfile
+++ b/src/shlibafsrpc/mapfile
@@ -7,10 +7,7 @@
 
 {
     global:
-       des_cbc_init;
        des_check_key_parity;
-       des_cksum_init;
-       des_des_init;
        des_fixup_key_parity;
        des_init_random_number_generator;
        des_is_weak_key;
@@ -45,8 +42,6 @@
        rxkad_GetServerInfo;
        rxkad_NewClientSecurityObject;
        rxkad_NewServerSecurityObject;
-       rxkad_client_init;
-       rxkad_crypt_init;
        rxnull_NewClientSecurityObject;
        rxnull_NewServerSecurityObject;
        rxs_Release;
@@ -60,7 +55,6 @@
        com_err;
        error_message;
        rx_socket;
-       des_pcbc_init;
        rxevent_debugFile;
        rx_debugFile;
        rx_connDeadTime;