all needs to be first rule in the Makefile
authorSimon Wilkinson <sxw@your-file-system.com>
Sun, 1 Apr 2012 19:09:57 +0000 (15:09 -0400)
committerJeffrey Altman <jaltman@secure-endpoints.com>
Mon, 9 Apr 2012 20:38:43 +0000 (13:38 -0700)
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 <shadow@dementix.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>

src/crypto/hcrypto/Makefile.in
src/roken/Makefile.in

index 0939a99..7c5ac22 100644 (file)
@@ -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}
index f4a195e..da0f103 100644 (file)
@@ -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)