From a49323a5a630eacc64ca0918fb4ae05cce1fac8d Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Sat, 18 Jan 2014 22:01:59 -0500 Subject: [PATCH] libadmin: makefile rule for afs_AdminError.h Add a makefile rule to export the libadmin afs_AdminErrors.h header file, instead of exporting afs_AdminErrors.h as a side effect of generating the afs_AdminBosErrors error table. Add the missing afs_AdminErrors.h dependency to the afs_utilAdmin.o dependency list. Reviewed-on: http://gerrit.openafs.org/10369 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk Reviewed-by: Derrick Brashear (cherry picked from commit 9b1ffeeeb62cd9535dc2fc1522400abb428a0ac2) Change-Id: Ib526d18227a6c37eac08def5ab88eb1717a848f1 Reviewed-on: http://gerrit.openafs.org/11233 Tested-by: BuildBot Reviewed-by: Chas Williams - CONTRACTOR Reviewed-by: Benjamin Kaduk Reviewed-by: Stephan Wiesand --- src/libadmin/adminutil/Makefile.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/libadmin/adminutil/Makefile.in b/src/libadmin/adminutil/Makefile.in index 779fd223b..0b29f99e8 100644 --- a/src/libadmin/adminutil/Makefile.in +++ b/src/libadmin/adminutil/Makefile.in @@ -25,7 +25,8 @@ UBIK = ../../ubik VLSERVER = ../../vlserver VOLSER = ../../volser -all: ${TOP_LIBDIR}/libafsadminutil.a ${TOP_INCDIR}/afs/afs_utilAdmin.h +all: ${TOP_LIBDIR}/libafsadminutil.a ${TOP_INCDIR}/afs/afs_utilAdmin.h \ + ${TOP_INCDIR}/afs/afs_AdminErrors.h ${TOP_LIBDIR}/libafsadminutil.a: libafsadminutil.a ${INSTALL_DATA} $? $@ @@ -33,9 +34,10 @@ ${TOP_LIBDIR}/libafsadminutil.a: libafsadminutil.a ${TOP_INCDIR}/afs/afs_utilAdmin.h: afs_utilAdmin.h ${INSTALL_DATA} $? $@ -afs_AdminBosErrors.h: afs_AdminBosErrors.c -afs_AdminBosErrors.c: afs_AdminBosErrors.et - ${INSTALL_DATA} ${srcdir}/afs_AdminErrors.h ${TOP_INCDIR}/afs +${TOP_INCDIR}/afs/afs_AdminErrors.h: afs_AdminErrors.h + ${INSTALL_DATA} $? $@ + +afs_AdminBosErrors.c afs_AdminBosErrors.h: afs_AdminBosErrors.et $(RM) -f afs_AdminBosErrors.c afs_AdminBosErrors.h ${COMPILE_ET} -p ${srcdir} afs_AdminBosErrors.et -h afs_AdminBosErrors @@ -154,7 +156,7 @@ afs_utilAdmin.o: afs_utilAdmin.h ${TOP_INCDIR}/afs/afs_AdminBosErrors.h ${TOP_IN ${TOP_INCDIR}/afs/afs_AdminVosErrors.h ${TOP_INCDIR}/afs/afs_AdminClientErrors.h \ ${TOP_INCDIR}/afs/afs_AdminCommonErrors.h ${TOP_INCDIR}/afs/afs_AdminKasErrors.h \ ${TOP_INCDIR}/afs/afs_AdminMiscErrors.h ${TOP_INCDIR}/afs/afs_AdminPtsErrors.h \ - ${TOP_INCDIR}/afs/afs_AdminCfgErrors.h + ${TOP_INCDIR}/afs/afs_AdminCfgErrors.h ${TOP_INCDIR}/afs/afs_AdminErrors.h ktc_errors.o: ${AUTH}/ktc_errors.c ${CCRULE} -- 2.39.5