Makefile: allow $(ARFLAGS) specified from the command line

We can do this because we have a very simple needs and run "ar"
exactly the same way everywhere ;-).

Requested-by: Jeffrey Walton
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index e0caec3f679089b6643e129fbdb2423dfd8f6d94..447011195c50c6120e380cbef35da8db0393db0f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -351,6 +351,9 @@ ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
 ALL_LDFLAGS = $(LDFLAGS)
 STRIP ?= strip
 
 ALL_LDFLAGS = $(LDFLAGS)
 STRIP ?= strip
 

+# Create as necessary, replace existing, make ranlib unneeded.
+ARFLAGS = rcs
+

 # Among the variables below, these:
 #   gitexecdir
 #   template_dir
 # Among the variables below, these:
 #   gitexecdir
 #   template_dir


@@ -2068,13 +2071,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS
                $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
 
 $(LIB_FILE): $(LIB_OBJS)
                $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
 
 $(LIB_FILE): $(LIB_OBJS)

-       $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
+       $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^

 
 $(XDIFF_LIB): $(XDIFF_OBJS)
 
 $(XDIFF_LIB): $(XDIFF_OBJS)

-       $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
+       $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^

 
 $(VCSSVN_LIB): $(VCSSVN_OBJS)
 
 $(VCSSVN_LIB): $(VCSSVN_OBJS)

-       $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
+       $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^

 
 export DEFAULT_EDITOR DEFAULT_PAGER
 
 
 export DEFAULT_EDITOR DEFAULT_PAGER