From: Derrick Brashear Date: Fri, 10 Jun 2011 22:40:33 +0000 (-0400) Subject: generated: take into account the things needed in master X-Git-Tag: upstream/1.8.0_pre1^2~3634 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6cf9254ec29ef10dfd4515f192f53f6c935b2375;p=packages%2Fo%2Fopenafs.git generated: take into account the things needed in master we need roken and hcrypto to build the bits we need to build the compiler tools on master. do so. Change-Id: I3e974a5d94bdfdf3e89f3d18aed55ed586b0034d Reviewed-on: http://gerrit.openafs.org/4835 Reviewed-by: Derrick Brashear Tested-by: BuildBot --- diff --git a/Makefile.in b/Makefile.in index f0498eba3..b625a46c8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -63,6 +63,8 @@ generated: force buildtools +${COMPILE_PART1} vlserver ${COMPILE_GENERATED} +${COMPILE_PART1} volser ${COMPILE_GENERATED} +${COMPILE_PART1} config ${COMPILE_PART2A} generated_clean + +${COMPILE_PART1} roken ${COMPILE_PART2A} clean + +${COMPILE_PART1} crypto/hcrypto ${COMPILE_PART2A} clean install: all install_dirs $(MAKE) build COMPILE_PART2B=install diff --git a/src/crypto/hcrypto/Makefile.in b/src/crypto/hcrypto/Makefile.in index d16871d47..3199b469f 100644 --- a/src/crypto/hcrypto/Makefile.in +++ b/src/crypto/hcrypto/Makefile.in @@ -35,6 +35,8 @@ MODULE_INCLUDE=-I${srcdir} -I${TOP_INCDIR}/hcrypto -I$(UPSTREAM)/hcrypto SHLIBOBJ= libafshcrypto.${SHLIB_SUFFIX}.${LIBMAJOR}.${LIBMINOR} +buildtools: ${HEADERS} ${TOP_LIBDIR}/libafshcrypto.a + all: ${HEADERS} ${TOP_LIBDIR}/${SHLIBOBJ} \ ${TOP_LIBDIR}/libafshcrypto.a \ ${TOP_LIBDIR}/libafshcrypto_lwp.a diff --git a/src/roken/Makefile.in b/src/roken/Makefile.in index afa03d33d..539620a4d 100644 --- a/src/roken/Makefile.in +++ b/src/roken/Makefile.in @@ -16,6 +16,8 @@ UPSTREAM = $(TOP_SRCDIR)/external/heimdal/roken SHLIBOBJ = librokenafs.${SHLIB_SUFFIX}.${LIBMAJOR}.${LIBMINOR} +buildtools: $(ROKEN_HEADERS) $(HEADERS) $(TOP_LIBDIR)/librokenafs.a + all: $(ROKEN_HEADERS) $(HEADERS) \ $(TOP_LIBDIR)/$(SHLIBOBJ) \ $(TOP_LIBDIR)/librokenafs.a