From bb84ed0f5609ea64f75cb4188fe76d15c160f3be Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Tue, 2 Oct 2012 23:42:35 -0400 Subject: [PATCH] config: make makefile builder be a config tool also all of our helper tools should be configured in one place, so a cross compile can override them Change-Id: I35044832257fa3389504f79207aa423e39d1ad4a Reviewed-on: http://gerrit.openafs.org/8198 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- Makefile.in | 4 ++-- src/config/Makefile.config.in | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index f3c71e4a7..44d914ac2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -478,7 +478,7 @@ libafs: config export rfc3961 hcrypto lwp_depinstall \ libacl_depinstall afs_depinstall dir_depinstall \ rxstat_depinstall sys_depinstall auth_depinstall \ rxosdsrc - src/config/config src/libafs/MakefileProto.${MKAFS_OSTYPE} src/libafs/Makefile ${SYS_NAME} + ${CONFIGTOOL} src/libafs/MakefileProto.${MKAFS_OSTYPE} src/libafs/Makefile ${SYS_NAME} +${COMPILE_PART1} libafs ${COMPILE_PART2} libafs_tree: export lwp_depinstall rx_depinstall vlserver_depinstall tvlserver_depinstall rxkad_depinstall fsint_depinstall \ @@ -495,7 +495,7 @@ libafs_tree: export lwp_depinstall rx_depinstall vlserver_depinstall tvlserver_d # libuafs_setup: config export - src/config/config src/libuafs/MakefileProto.${MKAFS_OSTYPE} src/libuafs/Makefile ${SYS_NAME} + ${CONFIGTOOL} src/libuafs/MakefileProto.${MKAFS_OSTYPE} src/libuafs/Makefile ${SYS_NAME} libuafs: libuafs_setup vlserver_depinstall tvlserver_depinstall rx_depinstall fsint_depinstall \ auth_depinstall dir_depinstall libacl_depinstall rxkad_depinstall \ diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in index 9bc0a14f3..75b63274e 100644 --- a/src/config/Makefile.config.in +++ b/src/config/Makefile.config.in @@ -145,6 +145,7 @@ KERNELDIR = ../libafs # Build helper apps # COMPILE_ET = ${TOP_OBJDIR}/src/comerr/compile_et +CONFIGTOOL = ${TOP_OBJDIR}/src/config/config RXGEN = ${TOP_OBJDIR}/src/rxgen/rxgen SHELL = @SHELL@ LWPTOOL = ${TOP_SRCDIR}/config/lwptool -- 2.39.5