srcdir=@srcdir@
include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.pthread
+HELPER_SPLINT=@HELPER_SPLINT@
+ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
-CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c $?
-
-RX=../rx
-UTIL=../util
-PTSERVER=../ptserver
+RX=$(srcdir)/../rx
+UTIL=$(srcdir)/../util
+PTSERVER=$(srcdir)/../ptserver
RXOBJS= rx_pthread.o rxkad_errs.o
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
- volparse.o flipbase64.o softsig.o hostparse.o snprintf.o pthread_glock.o
+UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o \
+ volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o \
+ pthread_threadname.o
+
+PTOBJS=ptuser.o pterror.o ptint.cs.o ptint.xdr.o
INCLS=${TOP_INCDIR}/ubik.h \
${TOP_INCDIR}/lock.h \
${TOP_INCDIR}/rx/xdr.h \
${TOP_INCDIR}/afs/keys.h \
${TOP_INCDIR}/afs/cellconfig.h \
- ${PTSERVER}/ptserver.h \
- ${PTSERVER}/ptclient.h \
- ${PTSERVER}/ptuser.h \
- ptint.h \
- pterror.h \
- ${PTSERVER}/map.h \
- ${PTSERVER}/ptprototypes.h
-
-LINCLS=${TOP_INCDIR}/ubik.h \
- ${TOP_INCDIR}/lock.h \
- ${TOP_INCDIR}/rx/rx.h \
- ${TOP_INCDIR}/rx/xdr.h \
- ${TOP_INCDIR}/rx/rxkad.h \
- ${TOP_INCDIR}/afs/auth.h \
- ${TOP_INCDIR}/afs/cellconfig.h \
- ${PTSERVER}/ptclient.h \
- ${PTSERVER}/ptuser.h \
ptint.h \
pterror.h
-LIBS=${RXOBJS} ${UTILOBJS}\
+LIBS_common=$(RXOBJS) $(UTILOBJS) \
${TOP_LIBDIR}/libubik_pthread.a \
${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \
${TOP_LIBDIR}/libcmd.a \
- ${TOP_LIBDIR}/libafsutil.a
+ ${TOP_LIBDIR}/libafsutil.a \
+ $(top_builddir)/src/opr/liboafs_opr.la
+
+LIBS_server= \
+ ${TOP_LIBDIR}/libaudit.a \
+ $(LIBS_common)
-all: ptserver pts pt_util db_verify ${TOP_LIBDIR}/libprot.a \
+LIBS_client=$(PTOBJS) \
+ $(LIBS_common)
+
+all: ptserver pts pt_util db_verify \
depinstall readgroup readpwd testpt
depinstall:
+# When supergroups is enabled, some parts of ptserver cast between
+# incompatible structs.
+CFLAGS_ptutils.o = @CFLAGS_NOSTRICT@
+CFLAGS_ptprocs.o = @CFLAGS_NOSTRICT@
+
#
# Build targets
#
rx_pthread.o: ${RX}/rx_pthread.c
- ${CCRULE}
+ $(AFS_CCRULE) $(RX)/rx_pthread.c
rxkad_errs.o: ../rxkad/rxkad_errs.c
- ${CCRULE}
+ $(AFS_CCRULE) ../rxkad/rxkad_errs.c
#
# get the pthreaded util stuff compiled here. we do this instead of
# using the non-pthreaded libutil.a. There probably should be a
# pthreaded version of this library, as we are doing with ubik itself, but...
-#
+
assert.o: ${UTIL}/assert.c
- ${CCRULE}
+ $(AFS_CCRULE) $(UTIL)/assert.c
uuid.o: ${UTIL}/uuid.c
- ${CCRULE}
+ $(AFS_CCRULE) $(UTIL)/uuid.c
serverLog.o: ${UTIL}/serverLog.c
- ${CCRULE}
+ $(AFS_CCRULE) $(UTIL)/serverLog.c
fileutil.o: ${UTIL}/fileutil.c
- ${CCRULE}
+ $(AFS_CCRULE) $(UTIL)/fileutil.c
volparse.o: ${UTIL}/volparse.c
- ${CCRULE}
+ $(AFS_CCRULE) $(UTIL)/volparse.c
flipbase64.o: ${UTIL}/flipbase64.c
- ${CCRULE}
-
-netutils.o: ${UTIL}/netutils.c
- ${CCRULE}
+ $(AFS_CCRULE) $(UTIL)/flipbase64.c
dirpath.o: ${UTIL}/dirpath.c
- ${CCRULE}
+ $(AFS_CCRULE) $(UTIL)/dirpath.c
softsig.o: ${UTIL}/softsig.c
- ${CCRULE}
+ $(AFS_CCRULE) $(UTIL)/softsig.c
hostparse.o: ${UTIL}/hostparse.c
- ${CCRULE}
-
-snprintf.o: ${UTIL}/snprintf.c
- ${CCRULE}
+ $(AFS_CCRULE) $(UTIL)/hostparse.c
pthread_glock.o: ${UTIL}/pthread_glock.c
- ${CCRULE}
+ $(AFS_CCRULE) $(UTIL)/pthread_glock.c
+pthread_threadname.o: ${UTIL}/pthread_threadname.c
+ $(AFS_CCRULE) $(UTIL)/pthread_threadname.c
-ptserver.o: ${PTSERVER}/ptserver.c
- ${CCRULE}
+ptserver.o: ${PTSERVER}/ptserver.c ${INCLS}
+ $(AFS_CCRULE) $(PTSERVER)/ptserver.c
-ptutils.o: ${PTSERVER}/ptutils.c
- ${CCRULE}
+ptutils.o: ${PTSERVER}/ptutils.c ${INCLS}
+ $(AFS_CCRULE) $(PTSERVER)/ptutils.c
-ptprocs.o: ${PTSERVER}/ptprocs.c
- ${CCRULE}
+ptprocs.o: ${PTSERVER}/ptprocs.c ${INCLS}
+ $(AFS_CCRULE) $(PTSERVER)/ptprocs.c
-utils.o: ${PTSERVER}/utils.c
- ${CCRULE}
+utils.o: ${PTSERVER}/utils.c ${INCLS}
+ $(AFS_CCRULE) $(PTSERVER)/utils.c
-map.o: ${PTSERVER}/map.c
- ${CCRULE}
+map.o: ${PTSERVER}/map.c ${INCLS}
+ $(AFS_CCRULE) $(PTSERVER)/map.c
ptint.ss.o: ptint.ss.c
- ${CCRULE}
-
ptint.cs.o: ptint.cs.c
- ${CCRULE}
-
ptint.xdr.o: ptint.xdr.c
- ${CCRULE}
ptint.cs.c: ${PTSERVER}/ptint.xg
- ${RXGEN} -x -C -u -o $@ ${PTSERVER}/ptint.xg
+ ${RXGEN} -A -x -C -u -o $@ ${srcdir}/${PTSERVER}/ptint.xg
ptint.ss.c: ${PTSERVER}/ptint.xg
- ${RXGEN} -x -S -o $@ ${PTSERVER}/ptint.xg
+ ${RXGEN} -A -x -S -o $@ ${srcdir}/${PTSERVER}/ptint.xg
ptint.xdr.c: ${PTSERVER}/ptint.xg
- ${RXGEN} -x -c -o $@ ${PTSERVER}/ptint.xg
+ ${RXGEN} -A -x -c -o $@ ${srcdir}/${PTSERVER}/ptint.xg
ptint.h: ${PTSERVER}/ptint.xg
- ${RXGEN} -x -h -u -o $@ ${PTSERVER}/ptint.xg
+ ${RXGEN} -A -x -h -u -o $@ ${srcdir}/${PTSERVER}/ptint.xg
ptint.cs.c: ptint.h
ptint.ss.c: ptint.h
ptint.xdr.c: ptint.h
Kptint.cs.c: ${PTSERVER}/ptint.xg Kptint.h
- ${RXGEN} -x -k -C -o Kptint.cs.c ${PTSERVER}/ptint.xg
+ ${RXGEN} -A -x -k -C -o Kptint.cs.c ${srcdir}/${PTSERVER}/ptint.xg
Kptint.xdr.c: ${PTSERVER}/ptint.xg
- ${RXGEN} -x -k -c -o Kptint.xdr.c ${PTSERVER}/ptint.xg
+ ${RXGEN} -A -x -k -c -o Kptint.xdr.c ${srcdir}/${PTSERVER}/ptint.xg
Kptint.h: ${PTSERVER}/ptint.xg
- ${RXGEN} -x -k -h -o Kptint.h ${PTSERVER}/ptint.xg
+ ${RXGEN} -A -x -k -h -o Kptint.h ${srcdir}/${PTSERVER}/ptint.xg
-display.o: ${PTSERVER}/display.c
- ${CCRULE}
+display.o: ${PTSERVER}/display.c ${INCLS}
+ ${AFS_CCRULE} ${PTSERVER}/display.c
-ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${TOP_LIBDIR}/libaudit.a map.o
- ${CC} ${LDFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o map.o $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libaudit.a
+ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o map.o \
+ $(LIBS_server)
+ $(LT_LDRULE_static) ptserver.o ptutils.o ptprocs.o \
+ ptint.ss.o ptint.xdr.o utils.o map.o \
+ $(LIBS_server) \
+ $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} \
+ ${XLIBS}
-db_verify.o: ${PTSERVER}/db_verify.c
- ${CCRULE}
+db_verify.o: ${PTSERVER}/db_verify.c ${INCLS}
+ $(AFS_CCRULE) $(PTSERVER)/db_verify.c
-db_verify: db_verify.o pterror.o display.o $(LIBS)
- $(CC) ${LDFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${MT_LIBS} ${XLIBS}
+db_verify: db_verify.o display.o $(LIBS_client)
+ $(LT_LDRULE_static) db_verify.o display.o \
+ $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
-ptclient: ptclient.o display.o libprot.a $(LIBS)
- $(CC) ${LDFLAGS} -o ptclient ptclient.o display.o libprot.a $(LIBS) ${MT_LIBS} ${XLIBS}
+ptclient: ptclient.o display.o ptuser.o ptint.cs.o ptint.xdr.o \
+ AFS_component_version_number.o $(LIBS_client)
+ $(LT_LDRULE_static) ptclient.o display.o $(PTOBJS) \
+ $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
-ptclient.o: ${PTSERVER}/ptclient.c
- ${CCRULE}
+ptclient.o: ${PTSERVER}/ptclient.c ${INCLS}
+ $(AFS_CCRULE) $(PTSERVER)/ptclient.c
-ptuser.o: ${PTSERVER}/ptuser.c
- ${CCRULE}
+ptuser.o: ${PTSERVER}/ptuser.c ${INCLS}
+ $(AFS_CCRULE) $(PTSERVER)/ptuser.c
pterror.h pterror.c: ${PTSERVER}/pterror.et
$(RM) -f pterror.h pterror.c
- ${COMPILE_ET} -p ${PTSERVER} pterror
-
-libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o
- $(RM) -f $@
- $(AR) crv $@ ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o
- $(RANLIB) $@
+ ${COMPILE_ET} -p ${srcdir}/${PTSERVER} pterror
-pts: pts.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS)
- $(CC) ${LDFLAGS} -o pts pts.o ${TOP_LIBDIR}/libcmd.a libprot.a ${LIBS} ${MT_LIBS} ${XLIBS}
+pts: pts.o ${TOP_LIBDIR}/libcmd.a $(LIBS_client) ${INCLS}
+ $(LT_LDRULE_static) pts.o \
+ ${LIBS_client} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
pts.o: ${PTSERVER}/pts.c
- ${CCRULE}
+ $(AFS_CCRULE) $(PTSERVER)/pts.c
-readgroup: readgroup.o libprot.a $(LIBS)
- $(CC) ${CFLAGS} -o readgroup readgroup.o libprot.a ${LIBS} ${MT_LIBS} ${XLIBS}
+readgroup: readgroup.o $(LIBS_client)
+ $(LT_LDRULE_static) readgroup.o \
+ $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
-readgroup.o: ${PTSERVER}/readgroup.c
- ${CCRULE}
+readgroup.o: ${PTSERVER}/readgroup.c ${INCLS}
+ $(AFS_CCRULE) $(PTSERVER)/readgroup.c
-readpwd: readpwd.o libprot.a $(LIBS)
- $(CC) ${CFLAGS} -o readpwd readpwd.o libprot.a ${LIBS} ${MT_LIBS} ${XLIBS}
+readpwd: readpwd.o $(LIBS_client)
+ $(LT_LDRULE_static) readpwd.o \
+ $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
-readpwd.o: ${PTSERVER}/readpwd.c
- ${CCRULE}
+readpwd.o: ${PTSERVER}/readpwd.c ${INCLS}
+ $(AFS_CCRULE) $(PTSERVER)/readpwd.c
-testpt: testpt.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS)
- $(CC) ${CFLAGS} -o testpt testpt.o -lm ${TOP_LIBDIR}/libcmd.a libprot.a $(LIBS) ${MT_LIBS} ${XLIBS}
+testpt: testpt.o $(LIBS_client)
+ $(LT_LDRULE_static) testpt.o -lm \
+ $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
-testpt.o: ${PTSERVER}/testpt.c
- ${CCRULE}
+testpt.o: ${PTSERVER}/testpt.c ${INCLS}
+ $(AFS_CCRULE) $(PTSERVER)/testpt.c
-pt_util: pt_util.o ptutils.o ubik.o utils.o map.o libprot.a $(LIBS)
- $(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o map.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) ${MT_LIBS} ${XLIBS}
+pt_util: pt_util.o ptutils.o ubik.o utils.o map.o $(LIBS_client)
+ $(LT_LDRULE_static) pt_util.o ptutils.o ubik.o utils.o map.o \
+ $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
pt_util.o: ${PTSERVER}/pt_util.c
- ${CCRULE}
+ $(AFS_CCRULE) $(PTSERVER)/pt_util.c
-ubik.o: ${PTSERVER}/ubik.c
- ${CCRULE}
+ubik.o: ${PTSERVER}/ubik.c ${INCLS}
+ $(AFS_CCRULE) $(PTSERVER)/ubik.c
prerror.h: pterror.h
${INSTALL} $? $@
#
# Installation targets
#
-install: \
- ${DESTDIR}${afssrvlibexecdir}/ptserver \
- ${DESTDIR}${afssrvbindir}/pts \
- ${DESTDIR}${bindir}/pts \
- ${DESTDIR}${afssrvsbindir}/pt_util \
- ${DESTDIR}${afssrvsbindir}/prdb_check
-
-${DEST}/root.server/usr/afs/bin/ptserver: ptserver
- ${INSTALL} $? $@
-
-${DEST}/bin/pts ${DEST}/root.server/usr/afs/bin/pts: pts
- ${INSTALL} $? $@
-
-${DEST}/root.server/usr/afs/bin/pt_util: pt_util
- ${INSTALL} $? $@
-
-${DEST}/etc/prdb_check: db_verify
- ${INSTALL} -f $? $@
+install: ptserver pts pt_util db_verify
+ if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then \
+ ${LT_INSTALL_PROGRAM} ptserver \
+ ${DESTDIR}${afssrvlibexecdir}/ptserver; \
+ ${LT_INSTALL_PROGRAM} pts ${DESTDIR}${afssrvbindir}/pts; \
+ ${LT_INSTALL_PROGRAM} pts ${DESTDIR}${bindir}/pts; \
+ ${LT_INSTALL_PROGRAM} pt_util ${DESTDIR}${afssrvsbindir}/pt_util; \
+ ${LT_INSTALL_PROGRAM} db_verify \
+ ${DESTDIR}${afssrvsbindir}/prdb_check; \
+ fi
+
+dest: ptserver pts pt_util db_verify
+ if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then \
+ ${INSTALL_PROGRAM} ptserver ${DEST}/root.server/usr/afs/bin/ptserver; \
+ ${INSTALL_PROGRAM} pts ${DEST}/root.server/usr/afs/bin/pts; \
+ ${INSTALL_PROGRAM} pts ${DEST}/bin/pts; \
+ ${INSTALL_PROGRAM} pt_util ${DEST}/root.server/usr/afs/bin/pt_util; \
+ ${INSTALL_PROGRAM} db_verify ${DEST}/etc/prdb_check; \
+ fi
#
# Misc. targets
#
clean:
+ $(LT_CLEAN)
$(RM) -f *.a *.o ptserver ptint.cs.c ptint.ss.c ptclient ptint.xdr.c ptint.h \
- libprot.a pts readgroup readpwd db_verify testpt pt_util pterror.h pterror.c \
+ pts readgroup readpwd db_verify testpt pt_util pterror.h pterror.c \
core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c
include ../config/Makefile.version
-${DESTDIR}${afssrvlibexecdir}/ptserver: ptserver
- ${INSTALL} $? $@
-
-${DESTDIR}${afssrvbindir}/pts: pts
- ${INSTALL} $? $@
-
-${DESTDIR}${bindir}/pts: pts
- ${INSTALL} $? $@
-
-${DESTDIR}${afssrvsbindir}/pt_util: pt_util
- ${INSTALL} $? $@
-
-${DESTDIR}${afssrvsbindir}/prdb_check: db_verify
- ${INSTALL} -f $? $@
-
-${DESTDIR}${libdir}/afs/libprot.a: libprot.a
- ${INSTALL} $? $@
-
-${TOP_LIBDIR}/libprot.a: libprot.a
- ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/prclient.h: ${PTSERVER}/ptclient.h
- ${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/prclient.h: ${PTSERVER}/ptclient.h
- ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/prerror.h: pterror.h
- ${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/prerror.h: pterror.h
- ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/print.h: ptint.h
- ${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/print.h: ptint.h
- ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/prserver.h: ${PTSERVER}/ptserver.h
- ${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/prserver.h: ${PTSERVER}/ptserver.h
- ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/ptclient.h: ${PTSERVER}/ptclient.h
- ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/ptuser.h: ${PTSERVER}/ptuser.h
- ${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/ptclient.h: ${PTSERVER}/ptclient.h
- ${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/ptuser.h: ${PTSERVER}/ptuser.h
- ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/pterror.h: pterror.h
- ${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/pterror.h: pterror.h
- ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/ptint.h: ptint.h
- ${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/ptint.h: ptint.h
- ${INSTALL} $? $@
-
-${DESTDIR}${includedir}/afs/ptserver.h: ${PTSERVER}/ptserver.h
- ${INSTALL} $? $@
-
-${TOP_INCDIR}/afs/ptserver.h: ${PTSERVER}/ptserver.h
- ${INSTALL} $? $@
-
-
-dest: \
- ${DEST}/root.server/usr/afs/bin/ptserver \
- ${DEST}/root.server/usr/afs/bin/pts \
- ${DEST}/bin/pts \
- ${DEST}/root.server/usr/afs/bin/pt_util \
- ${DEST}/etc/prdb_check
\ No newline at end of file
git://git.openafs.org / openafs.git / blobdiff