From 82cf6654494b9b35ba4eac970e5f2bb466755f72 Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Sat, 18 Jan 2014 22:40:12 -0500 Subject: [PATCH] libadmin: rework compilation rules Change I47b3b184a3284b56c4047e27b58b6cb3a8e16cef will add dependencies on the header files to the library targets. Before this can be done, we have to avoid the use of $? in compilation rules because on AIX and OS X this causes the headers to be added to the compilation command, making builds fail. This is a 1.6-only change. The corresponding commit on the master branch, f22ae5f7d8b3c143de21355f819ab872a0cf76fd, is no candidate for a backport to 1.6. Change-Id: Iefb432555c60bcfdf51436ebe76a267969280fe0 Reviewed-on: http://gerrit.openafs.org/11353 Tested-by: BuildBot Reviewed-by: Chas Williams - CONTRACTOR Reviewed-by: D Brashear Reviewed-by: Benjamin Kaduk Reviewed-by: Stephan Wiesand --- src/libadmin/adminutil/Makefile.in | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/libadmin/adminutil/Makefile.in b/src/libadmin/adminutil/Makefile.in index ed3136e74..e63c73ea8 100644 --- a/src/libadmin/adminutil/Makefile.in +++ b/src/libadmin/adminutil/Makefile.in @@ -14,7 +14,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ CC = ${MT_CC} CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} -CCRULE = ${CC} ${CFLAGS} -c $? +CCRULE = ${CC} ${CFLAGS} -c RXKAD = ../../rxkad AUTH = ../../auth BOZO = ../../bozo @@ -159,34 +159,34 @@ afs_utilAdmin.o: afs_utilAdmin.h ${TOP_INCDIR}/afs/afs_AdminBosErrors.h ${TOP_IN ${TOP_INCDIR}/afs/afs_AdminCfgErrors.h ${TOP_INCDIR}/afs/afs_AdminErrors.h ktc_errors.o: ${AUTH}/ktc_errors.c - ${CCRULE} + ${CCRULE} ${AUTH}/ktc_errors.c acfg_errors.o: ${AUTH}/acfg_errors.c - ${CCRULE} + ${CCRULE} ${AUTH}/acfg_errors.c boserr.o: ${BOZO}/boserr.c - ${CCRULE} + ${CCRULE} ${BOZO}/boserr.c cmd_errors.o: ${CMD}/cmd_errors.c - ${CCRULE} + ${CCRULE} ${CMD}/cmd_errors.c kaerrors.o: ${KAUTH}/kaerrors.c - ${CCRULE} + ${CCRULE} ${KAUTH}/kaerrors.c pterror.o: ${PTSERVER}/pterror.c - ${CCRULE} + ${CCRULE} ${PTSERVER}/pterror.c rxkad_errs.o: ${RXKAD}/rxkad_errs.c - ${CCRULE} + ${CCRULE} ${RXKAD}/rxkad_errs.c uerrors.o: ${UBIK}/uerrors.c - ${CCRULE} + ${CCRULE} ${UBIK}/uerrors.c vl_errors.o: ${VLSERVER}/vl_errors.c - ${CCRULE} + ${CCRULE} ${VLSERVER}/vl_errors.c volerr.o: ${VOLSER}/volerr.c - ${CCRULE} + ${CCRULE} ${VOLSER}/volerr.c clean: $(RM) -f *.o libafsadminutil* -- 2.39.5