If we're doing our own xdr, we should be doing ALL of of own xdr, not

piecemeal.  This impacted on HP w/ duplicate symbols if -lnsl, and
missing symbols if no -lnsl.

(cherry picked from commit a6216b35ea93e41dac5082441b984a7e1a7b1800)

diff --git a/src/config/Makefile.hp_ux110.in b/src/config/Makefile.hp_ux110.in
index ca42600c91c00bf1e0e366d583ca1ae8d0872d45..719835a8fd5265fd6a28967c2ee83f6324352e6e 100644 (file)
--- a/src/config/Makefile.hp_ux110.in
+++ b/src/config/Makefile.hp_ux110.in
@@ -12,7 +12,7 @@ XCFLAGS0=-ldld -lc -Wp,-H200000 -Wl,-a,archive -DAUTH_DBM_LOG +z -Wl,+k -D_LARGE
 XCFLAGS=${XCFLAGS0} +DA1.0
 XCFLAGS64=${XCFLAGS0} +DA2.0W
 MT_CFLAGS=-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS}
-XLIBS=@LIB_AFSDB@ -lnsl
+XLIBS=@LIB_AFSDB@
 XLIBELFA=-lelf
 TXLIBS=/usr/lib/libHcurses.a
 MTLIBS=-lpthread

diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index f07ede9f4ae402e76e6a24fc511595153b5fb1b0..b9fa88b73841ecb2f5649aa4c8cf6d909a285287 100644 (file)
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -63,6 +63,8 @@ XDROBJS =\
        xdr_rx.o \
        xdr_int64.o \
        xdr_afsuuid.o \
+       xdr_update.o \
+       xdr_refernce.o \
        AFS_component_version_number.o
 
 RXOBJS =\

diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in
index bd2cac240afb123aba9143fc1d52d6e54d3ed0f5..dce3aeb16182daafea42388b92b8d854218c7a20 100644 (file)
--- a/src/rx/Makefile.in
+++ b/src/rx/Makefile.in
@@ -42,7 +42,7 @@ XDROBJS = xdr.o xdr_array.o xdr_arrayn.o xdr_rx.o xdr_afsuuid.o
 
 RXOBJS = rx_clock.o rx_event.o rx_user.o rx_lwp.o rx.o rx_null.o rx_globals.o \
        rx_getaddr.o rx_misc.o rx_packet.o rx_rdwr.o  rx_trace.o rx_conncache.o \
-       xdr_int64.o 
+       xdr_int64.o xdr_update.o xdr_refernce.o
 
 MULTIOBJS = rx_multi.o
 
@@ -56,7 +56,7 @@ XDROBJS_djgpp = xdr.o xdr_rec.o xdr_stdio.o \
 
 RXOBJS_djgpp = rx_clock.o rx_event.o rx_user.o rx_lwp.o rx.o rx_null.o rx_globals.o \
                rx_getaddr.o rx_misc.o rx_packet.o rx_rdwr.o  rx_trace.o rx_conncache.o \
-               xdr_int64.o rx_xmit_nt.o
+               xdr_int64.o xdr_update.o xdr_refernce.o rx_xmit_nt.o
 
 BASICINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
             rx_clock.h rx_queue.h rx_event.h