From 00c37e8634b97dba3431804cea467a046be525d5 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Fri, 21 May 2010 11:47:42 -0500 Subject: [PATCH] Install pthreaded ptserver and vlserver When --enable-pthreaded-ubik is specified, install the pthreaded versions of ptserver and vlserver instead of the non-pthreaded versions. Previously, the pthreaded versions were getting built but not installed with 'make dest' or 'make install'. Change-Id: If2f08342df4c94c1cce3001614d9e050222bf0f6 Reviewed-on: http://gerrit.openafs.org/2102 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/ptserver/Makefile.in | 25 ++++++++++++-------- src/tptserver/Makefile.in | 48 ++++++++++++++++++++++----------------- src/tvlserver/Makefile.in | 26 +++++++++++++-------- src/vlserver/Makefile.in | 17 +++++++++----- 4 files changed, 69 insertions(+), 47 deletions(-) diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in index 00e6bc2df..5e86b4016 100644 --- a/src/ptserver/Makefile.in +++ b/src/ptserver/Makefile.in @@ -10,6 +10,7 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@ INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/lock.h \ @@ -204,11 +205,13 @@ install: ptserver pts pt_util db_verify libprot.a ptclient.h pterror.h \ ${INSTALL} -d ${DESTDIR}${bindir} ${INSTALL} -d ${DESTDIR}${libdir}/afs ${INSTALL} -d ${DESTDIR}${includedir}/afs - ${INSTALL_PROGRAM} ptserver ${DESTDIR}${afssrvlibexecdir}/ptserver - ${INSTALL_PROGRAM} pts ${DESTDIR}${afssrvbindir}/pts - ${INSTALL_PROGRAM} pts ${DESTDIR}${bindir}/pts - ${INSTALL_PROGRAM} pt_util ${DESTDIR}${afssrvsbindir}/pt_util - ${INSTALL_PROGRAM} db_verify ${DESTDIR}${afssrvsbindir}/prdb_check + if [ "x$(ENABLE_PTHREADED_UBIK)" != "xyes" ] ; then + ${INSTALL_PROGRAM} ptserver ${DESTDIR}${afssrvlibexecdir}/ptserver \ + ${INSTALL_PROGRAM} pts ${DESTDIR}${afssrvbindir}/pts \ + ${INSTALL_PROGRAM} pts ${DESTDIR}${bindir}/pts \ + ${INSTALL_PROGRAM} pt_util ${DESTDIR}${afssrvsbindir}/pt_util \ + ${INSTALL_PROGRAM} db_verify ${DESTDIR}${afssrvsbindir}/prdb_check \ + fi ${INSTALL_DATA} libprot.a ${DESTDIR}${libdir}/afs/libprot.a ${INSTALL_DATA} ptclient.h ${DESTDIR}${includedir}/afs/prclient.h ${INSTALL_DATA} pterror.h ${DESTDIR}${includedir}/afs/prerror.h @@ -227,11 +230,13 @@ dest: ptserver pts pt_util db_verify libprot.a ptclient.h pterror.h \ ${INSTALL} -d ${DEST}/etc ${INSTALL} -d ${DEST}/lib/afs ${INSTALL} -d ${DEST}/include/afs - ${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 + 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; ${INSTALL_DATA} libprot.a ${DEST}/lib/afs/libprot.a ${INSTALL_DATA} ptclient.h ${DEST}/include/afs/prclient.h ${INSTALL_DATA} pterror.h ${DEST}/include/afs/prerror.h diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in index e25a92234..9735d65d5 100644 --- a/src/tptserver/Makefile.in +++ b/src/tptserver/Makefile.in @@ -12,9 +12,25 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ HELPER_SPLINT=@HELPER_SPLINT@ +ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@ CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c $? +ifeq ($(ENABLE_PTHREADED_UBIK),yes) +DEST_DEP = \ + ${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 +INST_DEP = \ + ${DESTDIR}${afssrvlibexecdir}/ptserver \ + ${DESTDIR}${afssrvbindir}/pts \ + ${DESTDIR}${bindir}/pts \ + ${DESTDIR}${afssrvsbindir}/pt_util \ + ${DESTDIR}${afssrvsbindir}/prdb_check +endif + RX=../rx UTIL=../util PTSERVER=../ptserver @@ -232,24 +248,19 @@ prerror.h: pterror.h # # Installation targets # -install: \ - ${DESTDIR}${afssrvlibexecdir}/ptserver \ - ${DESTDIR}${afssrvbindir}/pts \ - ${DESTDIR}${bindir}/pts \ - ${DESTDIR}${afssrvsbindir}/pt_util \ - ${DESTDIR}${afssrvsbindir}/prdb_check +install: $(INST_DEP) ${DEST}/root.server/usr/afs/bin/ptserver: ptserver - ${INSTALL} $? $@ + ${INSTALL_PROGRAM} $? $@ ${DEST}/bin/pts ${DEST}/root.server/usr/afs/bin/pts: pts - ${INSTALL} $? $@ + ${INSTALL_PROGRAM} $? $@ ${DEST}/root.server/usr/afs/bin/pt_util: pt_util - ${INSTALL} $? $@ + ${INSTALL_PROGRAM} $? $@ ${DEST}/etc/prdb_check: db_verify - ${INSTALL} -f $? $@ + ${INSTALL_PROGRAM} $? $@ # # Misc. targets @@ -261,23 +272,18 @@ clean: include ../config/Makefile.version ${DESTDIR}${afssrvlibexecdir}/ptserver: ptserver - ${INSTALL} $? $@ + ${INSTALL_PROGRAM} $? $@ ${DESTDIR}${afssrvbindir}/pts: pts - ${INSTALL} $? $@ + ${INSTALL_PROGRAM} $? $@ ${DESTDIR}${bindir}/pts: pts - ${INSTALL} $? $@ + ${INSTALL_PROGRAM} $? $@ ${DESTDIR}${afssrvsbindir}/pt_util: pt_util - ${INSTALL} $? $@ + ${INSTALL_PROGRAM} $? $@ ${DESTDIR}${afssrvsbindir}/prdb_check: db_verify - ${INSTALL} -f $? $@ + ${INSTALL_PROGRAM} -f $? $@ -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 +dest: $(DEST_DEP) diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in index d1a26117a..fe19c2fac 100644 --- a/src/tvlserver/Makefile.in +++ b/src/tvlserver/Makefile.in @@ -12,11 +12,23 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ HELPER_SPLINT=@HELPER_SPLINT@ +ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@ CC=${MT_CC} CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} CCRULE=${CC} ${CFLAGS} -c $? +ifeq ($(ENABLE_PTHREADED_UBIK),yes) +DEST_DEP = \ + ${DEST}/root.server/usr/afs/bin/vlserver \ + ${DEST}/etc/vldb_convert \ + ${DEST}/etc/vldb_check +INST_DEP = \ + ${DESTDIR}${afssrvlibexecdir}/vlserver \ + ${DESTDIR}${afssrvsbindir}/vldb_convert \ + ${DESTDIR}${afssrvsbindir}/vldb_check +endif + RX=../rx UTIL=../util VLSERVER=../vlserver @@ -187,26 +199,20 @@ ${DEST}/root.server/usr/afs/bin/vlserver: vlserver ${INSTALL} $? $@ ${DEST}/etc/vldb_convert: cnvldb - ${INSTALL} -f $? $@ + ${INSTALL} $? $@ -install: \ - ${DESTDIR}${afssrvlibexecdir}/vlserver \ - ${DESTDIR}${afssrvsbindir}/vldb_convert \ - ${DESTDIR}${afssrvsbindir}/vldb_check +install: $(INST_DEP) ${DESTDIR}${afssrvlibexecdir}/vlserver: vlserver ${INSTALL} $? $@ ${DESTDIR}${afssrvsbindir}/vldb_convert: cnvldb - ${INSTALL} -f $? $@ + ${INSTALL} $? $@ ${DESTDIR}${afssrvsbindir}/vldb_check: vldb_check ${INSTALL} $? $@ -dest: \ - ${DEST}/root.server/usr/afs/bin/vlserver \ - ${DEST}/etc/vldb_convert \ - ${DEST}/etc/vldb_check +dest: $(DEST_DEP) ${DEST}/etc/vldb_check: vldb_check ${INSTALL} $? $@ diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index 8f4b18985..0aa5c0276 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -11,6 +11,7 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +ENABLE_PTHREADED_UBIK = @ENABLE_PTHREADED_UBIK@ INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/lwp.h \ @@ -136,9 +137,11 @@ install: vlserver cnvldb vldb_check libvldb.a vl_opcodes.h vlserver.h \ ${INSTALL} -d ${DESTDIR}${afssrvsbindir} ${INSTALL} -d ${DESTDIR}${libdir}/afs ${INSTALL} -d ${DESTDIR}${includedir}/afs - ${INSTALL_PROGRAM} vlserver ${DESTDIR}${afssrvlibexecdir}/vlserver - ${INSTALL_PROGRAM} cnvldb ${DESTDIR}${afssrvsbindir}/vldb_convert - ${INSTALL_PROGRAM} vldb_check ${DESTDIR}${afssrvsbindir}/vldb_check + if [ "x$(ENABLE_PTHREADED_UBIK)" != "xyes" ] ; then \ + ${INSTALL_PROGRAM} vlserver ${DESTDIR}${afssrvlibexecdir}/vlserver; \ + ${INSTALL_PROGRAM} cnvldb ${DESTDIR}${afssrvsbindir}/vldb_convert; \ + ${INSTALL_PROGRAM} vldb_check ${DESTDIR}${afssrvsbindir}/vldb_check; \ + fi; ${INSTALL_DATA} libvldb.a ${DESTDIR}${libdir}/afs/libvldb.a ${INSTALL_DATA} vl_opcodes.h ${DESTDIR}${includedir}/afs/vl_opcodes.h ${INSTALL_DATA} vlserver.h ${DESTDIR}${includedir}/afs/vlserver.h @@ -151,9 +154,11 @@ dest: vlserver cnvldb vldb_check libvldb.a vl_opcodes.h vlserver.h \ ${INSTALL} -d ${DEST}/etc ${INSTALL} -d ${DEST}/lib/afs ${INSTALL} -d ${DEST}/include/afs - ${INSTALL_PROGRAM} vlserver ${DEST}/root.server/usr/afs/bin/vlserver - ${INSTALL_PROGRAM} cnvldb ${DEST}/etc/vldb_convert - ${INSTALL_PROGRAM} vldb_check ${DEST}/etc/vldb_check + if [ "x$(ENABLE_PTHREADED_UBIK)" != "xyes" ] ; then \ + ${INSTALL_PROGRAM} vlserver ${DEST}/root.server/usr/afs/bin/vlserver; \ + ${INSTALL_PROGRAM} cnvldb ${DEST}/etc/vldb_convert; \ + ${INSTALL_PROGRAM} vldb_check ${DEST}/etc/vldb_check; \ + fi; ${INSTALL_DATA} libvldb.a ${DEST}/lib/afs/libvldb.a ${INSTALL_DATA} vl_opcodes.h ${DEST}/include/afs/vl_opcodes.h ${INSTALL_DATA} vlserver.h ${DEST}/include/afs/vlserver.h -- 2.39.5