libafsrpc-makefile-fix-20071110

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

diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index 4ff1ed8..8d967cb 100644 (file)
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -11,6 +11,10 @@
 
 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}
@@ -27,11 +31,13 @@ DES = ${srcdir}/../des
 COMERR = ${srcdir}/../comerr
 UTIL = ${srcdir}/../util
 SYS = ${srcdir}/../sys
+LWP = ${srcdir}/../lwp
 
 SYSOBJS =\
        syscall.o
 
 UTILOBJS =\
+       assert.o \
        casestrcpy.o \
        base64.o
 
@@ -109,6 +115,9 @@ DESOBJS =\
 
 CRYPT_OBJ = crypt.o
 
+LWPOBJS = \
+       fasttime.o
+
 LIBOBJS = \
        ${RXOBJS} \
        ${DESOBJS} \
@@ -119,14 +128,13 @@ LIBOBJS = \
        ${SYSOBJS} \
        ${CRYPT_OBJ} \
        ${RXSTATOBJS} \
+       ${LWPOBJS} \
        ${FSINTOBJS}
 
 all: ${TOP_LIBDIR}/libafsrpc.a
 
-install: ${DESTDIR}${libdir}/libafsrpc.a
-
-${DEST}/lib/libafsrpc.a: libafsrpc.a
-       ${INSTALL} $? $@
+${TOP_LIBDIR}/libafsrpc.a: libafsrpc.a
+       ${INSTALL_DATA} $? $@
 
 libafsrpc.a: ${LIBOBJS}
        $(RM) -f $@
@@ -202,11 +210,11 @@ md4.o: ${RXKAD}/md4.c
 md5.o: ${RXKAD}/md5.c
        ${CCRULE} ${RXKAD}/md5.c
 
-fcrypt.o: ${TOP_SRCDIR}/src/rxkad/domestic/fcrypt.c
-       ${CCRULE} ${TOP_SRCDIR}/src/rxkad/domestic/fcrypt.c
+fcrypt.o: ${RXKAD}/domestic/fcrypt.c
+       ${CCRULE} ${RXKAD}/domestic/fcrypt.c
 
-crypt_conn.o: ${TOP_SRCDIR}/src/rxkad/domestic/crypt_conn.c
-       ${CCRULE} ${TOP_SRCDIR}/src/rxkad/domestic/crypt_conn.c
+crypt_conn.o: ${RXKAD}/domestic/crypt_conn.c
+       ${CCRULE} ${RXKAD}/domestic/crypt_conn.c
 
 AFS_component_version_number.o: ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c
        ${CCRULE} ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c
@@ -336,13 +344,19 @@ com_err.o: ${COMERR}/com_err.c
 casestrcpy.o: ${UTIL}/casestrcpy.c
        ${CCRULE} ${UTIL}/casestrcpy.c
 
+assert.o: ${UTIL}/assert.c
+       ${CCRULE} ${UTIL}/assert.c
+
 base64.o: ${UTIL}/base64.c
        ${CCRULE} ${UTIL}/base64.c
 
+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_* ) \
@@ -351,10 +365,10 @@ syscall.o: ${SYS}/syscall.s
                ${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${SYS}/syscall.s; \
                ${AS} -o syscall.o syscall.i; \
                $(RM) -f syscall.ss syscall.i;; \
-        *fbsd* | *nbsd* ) \
+        *bsd* ) \
                touch syscall.o ;; \
         *) \
-               /lib/cpp  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
+               $(CPP)  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
        esac
@@ -368,8 +382,8 @@ rxstat.cs.o: ${TOP_OBJDIR}/src/rxstat/rxstat.cs.c
 rxstat.ss.o: ${TOP_OBJDIR}/src/rxstat/rxstat.ss.c
        ${CCRULE} ${TOP_OBJDIR}/src/rxstat/rxstat.ss.c
 
-rxstat.xdr.o: ${TOP_OBJDIR}/src/rxstat//rxstat.xdr.c
-       ${CCRULE} ${TOP_OBJDIR}/src/rxstat//rxstat.xdr.c
+rxstat.xdr.o: ${TOP_OBJDIR}/src/rxstat/rxstat.xdr.c
+       ${CCRULE} ${TOP_OBJDIR}/src/rxstat/rxstat.xdr.c
 
 afsint.cs.o: ${TOP_OBJDIR}/src/fsint/afsint.cs.c
        ${CCRULE} ${TOP_OBJDIR}/src/fsint/afsint.cs.c
@@ -386,14 +400,13 @@ afscbint.xdr.o: ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c
 afsaux.o: ${FSINT}/afsaux.c
        ${CCRULE} ${FSINT}/afsaux.c
 
-clean:
-       $(RM) -f *.o libafsrpc*
-
-${DESTDIR}${libdir}/libafsrpc.a: libafsrpc.a
-       ${INSTALL} $? $@
-
-${TOP_LIBDIR}/libafsrpc.a: libafsrpc.a
-       ${INSTALL} $? $@
+install: libafsrpc.a
+       ${INSTALL} -d ${DESTDIR}${libdir}
+       ${INSTALL_DATA} libafsrpc.a ${DESTDIR}${libdir}/libafsrpc.a
 
-dest: ${DEST}/lib/libafsrpc.a
+dest: libafsrpc.a
+       ${INSTALL} -d ${DEST}/lib
+       ${INSTALL_DATA} libafsrpc.a ${DEST}/lib/libafsrpc.a
 
+clean:
+       $(RM) -f *.o libafsrpc*