From 80ec5db21d6395c29d5433541a2d9d63c975782f Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sun, 1 Apr 2012 15:09:57 -0400 Subject: [PATCH] all needs to be first rule in the Makefile Just running 'make' in a subdirectory will fire the first rule in that directory's Makefile. When the buildtools rules were added to roken and crypto, they were put at the start of the file, meaning that they fire in perference to 'all' Swap the ordering back so that 'make' does what would be expected Change-Id: I598a183f42c150a5da724b7403e91f89f74a0109 Reviewed-on: http://gerrit.openafs.org/7009 Reviewed-by: Derrick Brashear Tested-by: BuildBot Tested-by: Jeffrey Altman Reviewed-by: Jeffrey Altman --- src/crypto/hcrypto/Makefile.in | 4 ++-- src/roken/Makefile.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/crypto/hcrypto/Makefile.in b/src/crypto/hcrypto/Makefile.in index 0939a99a9..7c5ac227b 100644 --- a/src/crypto/hcrypto/Makefile.in +++ b/src/crypto/hcrypto/Makefile.in @@ -35,12 +35,12 @@ 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 +buildtools: ${HEADERS} ${TOP_LIBDIR}/libafshcrypto.a + install: libafshcrypto.a ${SHLIBOBJ} ${TOP_OBJDIR}/src/config/shlib-install -d ${DESTDIR}${libdir} \ -l libafshcrypto -M ${LIBMAJOR} -m ${LIBMINOR} diff --git a/src/roken/Makefile.in b/src/roken/Makefile.in index f4a195e8a..da0f10350 100644 --- a/src/roken/Makefile.in +++ b/src/roken/Makefile.in @@ -16,12 +16,12 @@ 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 +buildtools: $(ROKEN_HEADERS) $(HEADERS) $(TOP_LIBDIR)/librokenafs.a + install: librokenafs.a $(SHLIBOBJ) $(TOP_OBJDIR)/src/config/shlib-install -d $(DESTDIR)$(libdir) \ -l librokenafs -M $(LIBMAJOR) -m $(LIBMINOR) -- 2.39.5