# API version. When something changes, increment as appropriate.
# Ignore at your own risk.
LIBAFSRPCMAJOR=1
-LIBAFSRPCMINOR=0
+LIBAFSRPCMINOR=4
# Copyright 2000, International Business Machines Corporation and others.
# All Rights Reserved.
srcdir=@srcdir@
include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.shared
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+
+MODULE_CFLAGS=-DRXDEBUG
-CC=${MT_CC}
-INCLUDES=-I.. -I${srcdir}/../rx -I${srcdir}../des -I../des \
- -I../rxkad -I${srcdir}/../rxkad -I../rxstat -I../fsint
-CFLAGS = ${COMMON_CFLAGS} ${INCLUDES} -DRXDEBUG ${MT_CFLAGS} ${SHLIB_CFLAGS}
SFLAGS=-P -I${TOP_INCDIR}
-RX = ../rx
-CCRULE = ${CC} ${CFLAGS} -c $?
-RXKAD = ../rxkad
-RXSTAT = ../rxstat
-FSINT = ../fsint
-DES = ../des
-COMERR = ../comerr
-UTIL = ../util
+RX = $(srcdir)/../rx
+RXKAD = $(srcdir)/../rxkad
+RXSTAT = $(srcdir)/../rxstat
+FSINT = $(srcdir)/../fsint
+COMERR = $(srcdir)/../comerr
+UTIL = $(srcdir)/../util
SYS = ${srcdir}/../sys
+LWP = ${srcdir}/../lwp
SYSOBJS =\
syscall.o
xdr_array.o \
xdr_arrayn.o \
xdr_rx.o \
+ xdr_mem.o \
+ xdr_len.o \
xdr_int32.o \
xdr_int64.o \
xdr_afsuuid.o \
+ xdr_update.o \
+ xdr_refernce.o \
AFS_component_version_number.o
RXOBJS =\
rx_pthread.o \
rx.o \
rx_null.o \
+ rx_opaque.o \
rx_conncache.o \
rx_globals.o \
rx_getaddr.o \
+ rx_identity.o \
rx_misc.o \
rx_packet.o \
rx_rdwr.o \
+ rx_stats.o \
rx_trace.o \
rx_multi.o
ticket.o \
ticket5.o \
crc.o \
- md4.o \
- md5.o \
fcrypt.o \
crypt_conn.o
-DESOBJS =\
- des.o \
- cbc_encrypt.o \
- pcbc_encrypt.o \
- cksum.o \
- new_rnd_key.o \
- key_sched.o \
- debug_decl.o \
- quad_cksum.o \
- key_parity.o \
- weak_key.o \
- strng_to_key.o \
- misc.o \
- util.o
-
-CRYPT_OBJ = crypt.o
+LWPOBJS = \
+ fasttime.o
LIBOBJS = \
${RXOBJS} \
- ${DESOBJS} \
${XDROBJS} \
${RXKADOBJS} \
${COMERROBJS} \
${UTILOBJS} \
${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} ${TOP_LIBDIR}/libafsrpc_pic.a
-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}
+${TOP_LIBDIR}/libafsrpc_pic.a: libafsrpc_pic.a
+ ${INSTALL_DATA} libafsrpc_pic.a $@
-${DEST}/lib/libafsrpc.${SHLIB_SUFFIX}: ${DEST}/lib/${LIBAFSRPC}
- -ln -f -s ${LIBAFSRPC} ${DEST}/lib/libafsrpc.${SHLIB_SUFFIX}
+install: ${LIBAFSRPC} libafsrpc_pic.a
+ ../config/shlib-install -d ${DESTDIR}${libdir} \
+ -l libafsrpc -M ${LIBAFSRPCMAJOR} -m ${LIBAFSRPCMINOR}
+ ${INSTALL_DATA} libafsrpc_pic.a ${DESTDIR}${libdir}/libafsrpc_pic.a
-${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
+dest: ${LIBAFSRPC} libafsrpc_pic.a
+ ../config/shlib-install -d ${DEST}/lib \
+ -l libafsrpc -M ${LIBAFSRPCMAJOR} -m ${LIBAFSRPCMINOR}
+ ${INSTALL_DATA} libafsrpc_pic.a ${DEST}/lib/libafsrpc_pic.a
+
+${LIBAFSRPC}: ${LIBOBJS} libafsrpc.map
+ ../config/shlib-build -d $(srcdir) -l libafsrpc \
+ -M ${LIBAFSRPCMAJOR} -m ${LIBAFSRPCMINOR} -- \
+ $(LDFLAGS_roken) $(LDFLAGS_hcrypto) \
+ ${LIBOBJS} $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS)
+
+libafsrpc_pic.a: ${LIBOBJS}
+ $(RM) -f $@
+ $(AR) crv $@ ${LIBOBJS}
+ $(RANLIB) $@
rx_event.o: ${RX}/rx_event.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/rx_event.c
rx_user.o: ${RX}/rx_user.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/rx_user.c
rx_pthread.o: ${RX}/rx_pthread.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/rx_pthread.c
+CFLAGS_rx.o = @CFLAGS_NOERROR@
rx.o: ${RX}/rx.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/rx.c
rx_conncache.o: ${RX}/rx_conncache.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/rx_conncache.c
rx_null.o: ${RX}/rx_null.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/rx_null.c
+
+rx_opaque.o: ${RX}/rx_opaque.c
+ $(AFS_CCRULE) $(RX)/rx_opaque.c
+
+rx_globals.o: ${RX}/rx_globals.c
+ $(AFS_CCRULE) $(RX)/rx_globals.c
-rx_globals.o: ${RX}/rx_globals.c
- ${CCRULE}
+rx_identity.o: ${RX}/rx_identity.c
+ $(AFS_CCRULE) $(RX)/rx_identity.c
rx_getaddr.o: ${RX}/rx_getaddr.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/rx_getaddr.c
rx_misc.o: ${RX}/rx_misc.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/rx_misc.c
rx_packet.o: ${RX}/rx_packet.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/rx_packet.c
+
+rx_stats.o: ${RX}/rx_stats.c
+ $(AFS_CCRULE) $(RX)/rx_stats.c
rx_rdwr.o: ${RX}/rx_rdwr.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/rx_rdwr.c
rx_trace.o: ${RX}/rx_trace.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/rx_trace.c
rx_multi.o: ${RX}/rx_multi.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/rx_multi.c
rxkad_client.o: ${RXKAD}/rxkad_client.c
- ${CCRULE}
+ $(AFS_CCRULE) -I../rxkad $(RXKAD)/rxkad_client.c
rxkad_server.o: ${RXKAD}/rxkad_server.c
- ${CCRULE}
+ $(AFS_CCRULE) -I../rxkad $(RXKAD)/rxkad_server.c
rxkad_common.o: ${RXKAD}/rxkad_common.c
- ${CCRULE}
+ $(AFS_CCRULE) -I../rxkad $(RXKAD)/rxkad_common.c
ticket.o: ${RXKAD}/ticket.c
- ${CCRULE}
+ $(AFS_CCRULE) -I../rxkad $(RXKAD)/ticket.c
ticket5.o: ${RXKAD}/ticket5.c
- ${CCRULE}
+ $(AFS_CCRULE) -I../rxkad -I$(RXKAD) $(RXKAD)/ticket5.c
crc.o: ${RXKAD}/crc.c
- ${CCRULE}
-
-md4.o: ${RXKAD}/md4.c
- ${CCRULE}
+ $(AFS_CCRULE) -I../rxkad $(RXKAD)/crc.c
-md5.o: ${RXKAD}/md5.c
- ${CCRULE}
+fcrypt.o: ${RXKAD}/fcrypt.c
+ $(AFS_CCRULE) -I../rxkad $(RXKAD)/fcrypt.c
-fcrypt.o: ${RXKAD}/domestic/fcrypt.c
- ${CCRULE}
+crypt_conn.o: ${RXKAD}/crypt_conn.c
+ $(AFS_CCRULE) -I../rxkad $(RXKAD)/crypt_conn.c
-crypt_conn.o: ${RXKAD}/domestic/crypt_conn.c
- ${CCRULE}
-
-AFS_component_version_number.o: ${RX}/AFS_component_version_number.c
- ${CCRULE}
+AFS_component_version_number.o: ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c
+ $(AFS_CCRULE) ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c
xdr.o: ${RX}/xdr.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/xdr.c
xdr_int32.o: ${RX}/xdr_int32.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/xdr_int32.c
xdr_int64.o: ${RX}/xdr_int64.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/xdr_int64.c
xdr_array.o: ${RX}/xdr_array.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/xdr_array.c
xdr_arrayn.o: ${RX}/xdr_arrayn.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/xdr_arrayn.c
xdr_float.o: ${RX}/xdr_float.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/xdr_float.c
+
+xdr_len.o: ${RX}/xdr_len.c
+ $(AFS_CCRULE) $(RX)/xdr_len.c
xdr_mem.o: ${RX}/xdr_mem.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/xdr_mem.c
xdr_rec.o: ${RX}/xdr_rec.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/xdr_rec.c
xdr_refernce.o: ${RX}/xdr_refernce.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/xdr_refernce.c
xdr_rx.o: ${RX}/xdr_rx.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/xdr_rx.c
xdr_update.o: ${RX}/xdr_update.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/xdr_update.c
xdr_afsuuid.o: ${RX}/xdr_afsuuid.c
- ${CCRULE}
-
-# Note that the special case statement for compiling des.c is present
-# simply to work around a compiler bug on HP-UX 11.0. The symptom of
-# the problem is that linking the pthread fileserver fails with messages
-# such as
-#
-# pxdb internal warning: cu[84]: SLT_SRCFILE[411] out of synch
-# Please contact your HP Support representative
-# pxdb internal warning: cu[84]: SLT_SRCFILE[442] out of synch
-# pxdb internal warning: cu[84]: SLT_SRCFILE[450] out of synch
-# pxdb internal warning: cu[84]: SLT_SRCFILE[529] out of synch
-# pxdb internal warning: cu[84]: SLT_SRCFILE[544] out of synch
-# ...
-# pxdb32: internal error. File won't be debuggable (still a valid executable)
-# *** Error exit code 10
-#
-# The problematic version of pxdb is:
-#
-# $ what /opt/langtools/bin/pxdb32
-# /opt/langtools/bin/pxdb32:
-# HP92453-02 A.10.0A HP-UX SYMBOLIC DEBUGGER (PXDB) $Revision$
-#
-# The problem occurs when -g and -O are both used when compiling des.c.
-# The simplest way to work around the problem is to leave out either -g or -O.
-# Since des.c is relatively stable I've chosen to eliminate -g rather
-# than take any hit in performance.
-
-des.o: ${DES}/des.c
- set -x; \
- case ${SYS_NAME} in \
- hp_ux11*) \
- set X `echo ${CCRULE} | sed s/-g//`; shift; \
- "$$@" \
- ;; \
- *) \
- ${CCRULE} \
- ;; \
- esac
-
-crypt.o: ${DES}/crypt.c
- ${CCRULE}
-
-cbc_encrypt.o: ${DES}/cbc_encrypt.c
- ${CCRULE}
-
-pcbc_encrypt.o: ${DES}/pcbc_encrypt.c
- ${CCRULE}
-
-cksum.o: ${DES}/cksum.c
- ${CCRULE}
-
-new_rnd_key.o: ${DES}/new_rnd_key.c
- ${CCRULE}
-
-key_sched.o: ${DES}/key_sched.c
- ${CCRULE}
-
-debug_decl.o: ${DES}/debug_decl.c
- ${CCRULE}
-
-quad_cksum.o: ${DES}/quad_cksum.c
- ${CCRULE}
-
-key_parity.o: ${DES}/key_parity.c
- ${CCRULE}
-
-weak_key.o: ${DES}/weak_key.c
- ${CCRULE}
-
-strng_to_key.o: ${DES}/strng_to_key.c
- ${CCRULE}
-
-misc.o: ${DES}/misc.c
- ${CCRULE}
-
-util.o: ${DES}/util.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/xdr_afsuuid.c
error_msg.o: ${COMERR}/error_msg.c
- ${CCRULE}
+ $(AFS_CCRULE) $(COMERR)/error_msg.c
et_name.o: ${COMERR}/et_name.c
- ${CCRULE}
+ $(AFS_CCRULE) $(COMERR)/et_name.c
com_err.o: ${COMERR}/com_err.c
- ${CCRULE}
+ $(AFS_CCRULE) $(COMERR)/com_err.c
casestrcpy.o: ${UTIL}/casestrcpy.c
- ${CCRULE}
+ $(AFS_CCRULE) $(UTIL)/casestrcpy.c
assert.o: ${UTIL}/assert.c
- ${CCRULE} ${UTIL}/assert.c
+ $(AFS_CCRULE) $(UTIL)/assert.c
base64.o: ${UTIL}/base64.c
- ${CCRULE}
+ $(AFS_CCRULE) $(UTIL)/base64.c
+
+fasttime.o: ${LWP}/fasttime.c
+ $(AFS_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; \
+ $(PATH_CPP) ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \
as -o syscall.o syscall.ss; \
$(RM) syscall.ss;; \
+ arm_darwin_* ) \
+ touch syscall.c ; \
+ ${CC} ${AFS_CFLAGS} -c syscall.c;; \
sgi_* | *_darwin_* ) \
- ${CC} ${CFLAGS} -c ${SYS}/syscall.s;; \
+ ${CC} ${AFS_CFLAGS} -c ${SYS}/syscall.s;; \
alpha_dux?? ) \
- ${AS} -P ${CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${SYS}/syscall.s; \
+ ${AS} -P ${AFS_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* ) \
- touch syscall.o ;; \
+ touch syscall.c ; \
+ ${CC} ${AFS_CFLAGS} -c syscall.c;; \
*) \
- /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
rxstat.o: ${RXSTAT}/rxstat.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RXSTAT)/rxstat.c
-rxstat.cs.o: ${RXSTAT}/rxstat.cs.c
- ${CCRULE}
+rxstat.cs.o: ${TOP_OBJDIR}/src/rxstat/rxstat.cs.c
+ $(AFS_CCRULE) ${TOP_OBJDIR}/src/rxstat/rxstat.cs.c
-rxstat.ss.o: ${RXSTAT}/rxstat.ss.c
- ${CCRULE}
+rxstat.ss.o: ${TOP_OBJDIR}/src/rxstat/rxstat.ss.c
+ $(AFS_CCRULE) ${TOP_OBJDIR}/src/rxstat/rxstat.ss.c
-rxstat.xdr.o: ${RXSTAT}/rxstat.xdr.c
- ${CCRULE}
+rxstat.xdr.o: ${TOP_OBJDIR}/src/rxstat/rxstat.xdr.c
+ $(AFS_CCRULE) ${TOP_OBJDIR}/src/rxstat/rxstat.xdr.c
-afsint.cs.o: ${FSINT}/afsint.cs.c
- ${CCRULE}
+afsint.cs.o: ${TOP_OBJDIR}/src/fsint/afsint.cs.c
+ $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afsint.cs.c
-afsint.xdr.o: ${FSINT}/afsint.xdr.c
- ${CCRULE}
+afsint.xdr.o: ${TOP_OBJDIR}/src/fsint/afsint.xdr.c
+ $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afsint.xdr.c
-afscbint.cs.o: ${FSINT}/afscbint.cs.c
- ${CCRULE}
+afscbint.cs.o: ${TOP_OBJDIR}/src/fsint/afscbint.cs.c
+ $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afscbint.cs.c
-afscbint.xdr.o: ${FSINT}/afscbint.xdr.c
- ${CCRULE}
+afscbint.xdr.o: ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c
+ $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c
afsaux.o: ${FSINT}/afsaux.c
- ${CCRULE}
+ $(AFS_CCRULE) -I../fsint ${FSINT}/afsaux.c
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* \
+ libafsrpc_pic.a libafsrpc.dylib.* libafsrpc.exp
git://git.openafs.org / openafs.git / blobdiff