cpp-fixes-20080630

[openafs.git] / src / shlibafsrpc / Makefile.in

diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index 2c4b550..62c4170 100644 (file)
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -1,7 +1,7 @@
 # API version. When something changes, increment as appropriate. 
 # Ignore at your own risk.
 LIBAFSRPCMAJOR=1
-LIBAFSRPCMINOR=0
+LIBAFSRPCMINOR=1
 
 # Copyright 2000, International Business Machines Corporation and others.
 # All Rights Reserved.
@@ -16,6 +16,10 @@ LIBAFSRPCMINOR=0
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 CC=${MT_CC}
 INCLUDES=-I.. -I${srcdir}/../rx -I${srcdir}../des -I../des \
@@ -32,11 +36,13 @@ DES = ../des
 COMERR = ../comerr
 UTIL = ../util
 SYS = ${srcdir}/../sys
+LWP = ${srcdir}/../lwp
 
 SYSOBJS =\
        syscall.o
 
 UTILOBJS =\
+       assert.o \
        casestrcpy.o \
        base64.o
 
@@ -53,6 +59,8 @@ XDROBJS =\
        xdr_int32.o \
        xdr_int64.o \
        xdr_afsuuid.o \
+       xdr_update.o \
+       xdr_refernce.o \
        AFS_component_version_number.o
 
 RXOBJS =\
@@ -112,6 +120,9 @@ DESOBJS =\
 
 CRYPT_OBJ = crypt.o
 
+LWPOBJS = \
+       fasttime.o
+
 LIBOBJS = \
        ${RXOBJS} \
        ${DESOBJS} \
@@ -122,29 +133,29 @@ LIBOBJS = \
        ${SYSOBJS} \
        ${CRYPT_OBJ} \
        ${RXSTATOBJS} \
+       ${LWPOBJS} \
        ${FSINTOBJS}
 
 LIBAFSRPC = libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR}.${LIBAFSRPCMINOR}
 
-all: ${TOP_LIBDIR}/${LIBAFSRPC} ${TOP_LIBDIR}/libafsrpc.${SHLIB_SUFFIX}
+all: ${TOP_LIBDIR}/${LIBAFSRPC}
 
-install: ${DESTDIR}${libdir}/${LIBAFSRPC} ${DESTDIR}${libdir}/libafsrpc.${SHLIB_SUFFIX}
+${TOP_LIBDIR}/${LIBAFSRPC}: ${LIBAFSRPC}
+       ../config/shlib-install -d ${TOP_LIBDIR} \
+               -l libafsrpc -M ${LIBAFSRPCMAJOR} -m ${LIBAFSRPCMINOR}
 
-${DEST}/lib/${LIBAFSRPC}: ${LIBAFSRPC}
-       ${INSTALL} ${LIBAFSRPC} ${DEST}/lib/${LIBAFSRPC}
+install: ${LIBAFSRPC}
+       ../config/shlib-install -d ${DESTDIR}${libdir} \
+               -l libafsrpc -M ${LIBAFSRPCMAJOR} -m ${LIBAFSRPCMINOR}
 
-${DEST}/lib/libafsrpc.${SHLIB_SUFFIX}: ${DEST}/lib/${LIBAFSRPC}
-       -ln -f -s ${LIBAFSRPC} ${DEST}/lib/libafsrpc.${SHLIB_SUFFIX}
+dest: ${LIBAFSRPC}
+       ../config/shlib-install -d ${DEST}/lib \
+               -l libafsrpc -M ${LIBAFSRPCMAJOR} -m ${LIBAFSRPCMINOR}
 
 ${LIBAFSRPC}: ${LIBOBJS}
-       case ${SYS_NAME} in \
-       rs_aix4* | rs_aix5*) \
-               ${SHLIB_LINKER} -o ${LIBAFSRPC} ${LIBOBJS} -bE:${srcdir}/afsrpc.exp ${MT_LIBS};; \
-       sun*_5*) \
-               ${SHLIB_LINKER} -h ${LIBAFSRPC} -o ${LIBAFSRPC} ${LIBOBJS} ${MT_LIBS};; \
-       *) \
-               ${SHLIB_LINKER} -o ${LIBAFSRPC} ${LIBOBJS} ${MT_LIBS};; \
-       esac
+       ../config/shlib-build -d $(srcdir) -l libafsrpc \
+               -M ${LIBAFSRPCMAJOR} -m ${LIBAFSRPCMINOR} -- \
+               ${LIBOBJS} ${MT_LIBS}
 
 rx_event.o: ${RX}/rx_event.c
        ${CCRULE}
@@ -209,10 +220,10 @@ md4.o: ${RXKAD}/md4.c
 md5.o: ${RXKAD}/md5.c
        ${CCRULE}
 
-fcrypt.o: ${RXKAD}/fcrypt.c
+fcrypt.o: ${RXKAD}/domestic/fcrypt.c
        ${CCRULE}
 
-crypt_conn.o: ${RXKAD}/crypt_conn.c
+crypt_conn.o: ${RXKAD}/domestic/crypt_conn.c
        ${CCRULE}
 
 AFS_component_version_number.o: ${RX}/AFS_component_version_number.c
@@ -343,13 +354,19 @@ com_err.o: ${COMERR}/com_err.c
 casestrcpy.o: ${UTIL}/casestrcpy.c
        ${CCRULE}
 
+assert.o: ${UTIL}/assert.c
+       ${CCRULE}
+
 base64.o: ${UTIL}/base64.c
        ${CCRULE}
 
+fasttime.o: ${LWP}/fasttime.c
+       ${CCRULE} ${LWP}/fasttime.c
+
 syscall.o: ${SYS}/syscall.s
        case "$(SYS_NAME)" in \
             sun4x_5* | sunx86_5*) \
-               /usr/ccs/lib/cpp  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
+               $(CPP)  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
         sgi_* | *_darwin_* ) \
@@ -361,7 +378,7 @@ syscall.o: ${SYS}/syscall.s
         *fbsd* ) \
                touch syscall.o ;; \
         *) \
-               /lib/cpp  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
+               $(PATH_CPP) ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
        esac
@@ -394,19 +411,4 @@ afsaux.o: ${FSINT}/afsaux.c
        ${CCRULE}
 
 clean:
-       $(RM) -f *.o 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}: ${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}/lib/libafsrpc.${SHLIB_SUFFIX}
-
+       $(RM) -f *.o libafsrpc.a* libafsrpc.sl* libafsrpc.so*