From 0c694d710e40ffeedfe307df659dbddd29df495f Mon Sep 17 00:00:00 2001
From: Rob Shearman <rob@codeweavers.com>
Date: Tue, 4 Mar 2008 15:53:41 +0000
Subject: [PATCH] makefiles: Split AR into AR and ARFLAGS.

---
 Make.rules.in            | 3 ++-
 configure                | 8 ++++++--
 configure.ac             | 1 +
 dlls/Makedll.rules.in    | 2 +-
 dlls/Makeimplib.rules.in | 2 +-
 libs/port/Makefile.in    | 2 +-
 libs/wpp/Makefile.in     | 2 +-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 9178904f629..d4b6aaf450e 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -36,7 +36,8 @@ IMPLIBEXT = @IMPLIBEXT@
 LDSHARED  = @LDSHARED@
 DLLTOOL   = @DLLTOOL@
 DLLWRAP   = @DLLWRAP@
-AR        = @AR@ rc
+AR        = @AR@
+ARFLAGS   = @ARFLAGS@
 RANLIB    = @RANLIB@
 STRIP     = @STRIP@
 WINDRES   = @WINDRES@
diff --git a/configure b/configure
index 13896452908..efd70085a26 100755
--- a/configure
+++ b/configure
@@ -687,6 +687,7 @@ AS
 ac_ct_AS
 LD
 AR
+ARFLAGS
 RANLIB
 STRIP
 WINDRES
@@ -5600,6 +5601,8 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
+ARFLAGS=rc
+
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -23079,6 +23082,7 @@ AS!$AS$ac_delim
 ac_ct_AS!$ac_ct_AS$ac_delim
 LD!$LD$ac_delim
 AR!$AR$ac_delim
+ARFLAGS!$ARFLAGS$ac_delim
 RANLIB!$RANLIB$ac_delim
 STRIP!$STRIP$ac_delim
 WINDRES!$WINDRES$ac_delim
@@ -23088,7 +23092,6 @@ GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
 LDCONFIG!$LDCONFIG$ac_delim
 INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
@@ -23150,6 +23153,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
 LINT!$LINT$ac_delim
 LINTFLAGS!$LINTFLAGS$ac_delim
@@ -23224,7 +23228,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 72; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index 5d06e6f5225..b23a586d0c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,6 +158,7 @@ fi
 AC_CHECK_TOOLS(AS,[gas as],as)
 AC_CHECK_TOOL(LD,ld,ld)
 AC_CHECK_TOOL(AR,ar,ar)
+AC_SUBST(ARFLAGS,rc)
 AC_PROG_RANLIB
 AC_CHECK_TOOL(STRIP,strip,strip)
 AC_CHECK_TOOL(WINDRES,windres,false)
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index fde11e4cb33..241fc52bf94 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -52,7 +52,7 @@ lib$(BASEMODULE).def: $(MAINSPEC)
 
 lib$(BASEMODULE).def.a: $(IMPLIB_OBJS)
 	$(RM) $@
-	$(AR) $@ $(IMPLIB_OBJS)
+	$(AR) $(ARFLAGS) $@ $(IMPLIB_OBJS)
 	$(RANLIB) $@
 
 lib$(BASEMODULE).a: $(SPEC_DEF) $(IMPLIB_OBJS)
diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in
index 19011c17e06..88814fc5f27 100644
--- a/dlls/Makeimplib.rules.in
+++ b/dlls/Makeimplib.rules.in
@@ -18,7 +18,7 @@ all: $(MODULE)
 
 $(MODULE): $(OBJS) Makefile.in
 	$(RM) $@
-	$(AR) $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 # Rules for installation
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index 2504620b4a7..b7adc1281f4 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -36,7 +36,7 @@ all: $(MODULE)
 
 $(MODULE): $(OBJS) Makefile.in
 	$(RM) $@
-	$(AR) $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in
index 5d818b7ce86..713ee4d9fb3 100644
--- a/libs/wpp/Makefile.in
+++ b/libs/wpp/Makefile.in
@@ -17,7 +17,7 @@ all: $(MODULE)
 
 $(MODULE): $(OBJS)
 	$(RM) $@
-	$(AR) $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 ppy.tab.c: ppy.tab.h   # for parallel makes