makefiles: Split AR into AR and ARFLAGS.
This commit is contained in:
parent
48000893f9
commit
0c694d710e
|
@ -36,7 +36,8 @@ IMPLIBEXT = @IMPLIBEXT@
|
||||||
LDSHARED = @LDSHARED@
|
LDSHARED = @LDSHARED@
|
||||||
DLLTOOL = @DLLTOOL@
|
DLLTOOL = @DLLTOOL@
|
||||||
DLLWRAP = @DLLWRAP@
|
DLLWRAP = @DLLWRAP@
|
||||||
AR = @AR@ rc
|
AR = @AR@
|
||||||
|
ARFLAGS = @ARFLAGS@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
STRIP = @STRIP@
|
STRIP = @STRIP@
|
||||||
WINDRES = @WINDRES@
|
WINDRES = @WINDRES@
|
||||||
|
|
|
@ -687,6 +687,7 @@ AS
|
||||||
ac_ct_AS
|
ac_ct_AS
|
||||||
LD
|
LD
|
||||||
AR
|
AR
|
||||||
|
ARFLAGS
|
||||||
RANLIB
|
RANLIB
|
||||||
STRIP
|
STRIP
|
||||||
WINDRES
|
WINDRES
|
||||||
|
@ -5600,6 +5601,8 @@ else
|
||||||
AR="$ac_cv_prog_AR"
|
AR="$ac_cv_prog_AR"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ARFLAGS=rc
|
||||||
|
|
||||||
if test -n "$ac_tool_prefix"; then
|
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.
|
# 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
|
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
|
ac_ct_AS!$ac_ct_AS$ac_delim
|
||||||
LD!$LD$ac_delim
|
LD!$LD$ac_delim
|
||||||
AR!$AR$ac_delim
|
AR!$AR$ac_delim
|
||||||
|
ARFLAGS!$ARFLAGS$ac_delim
|
||||||
RANLIB!$RANLIB$ac_delim
|
RANLIB!$RANLIB$ac_delim
|
||||||
STRIP!$STRIP$ac_delim
|
STRIP!$STRIP$ac_delim
|
||||||
WINDRES!$WINDRES$ac_delim
|
WINDRES!$WINDRES$ac_delim
|
||||||
|
@ -23088,7 +23092,6 @@ GREP!$GREP$ac_delim
|
||||||
EGREP!$EGREP$ac_delim
|
EGREP!$EGREP$ac_delim
|
||||||
LDCONFIG!$LDCONFIG$ac_delim
|
LDCONFIG!$LDCONFIG$ac_delim
|
||||||
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
|
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
|
||||||
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
|
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
|
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
|
||||||
|
@ -23150,6 +23153,7 @@ _ACEOF
|
||||||
ac_delim='%!_!# '
|
ac_delim='%!_!# '
|
||||||
for ac_last_try in false false false false false :; do
|
for ac_last_try in false false false false false :; do
|
||||||
cat >conf$$subs.sed <<_ACEOF
|
cat >conf$$subs.sed <<_ACEOF
|
||||||
|
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
|
||||||
INSTALL_DATA!$INSTALL_DATA$ac_delim
|
INSTALL_DATA!$INSTALL_DATA$ac_delim
|
||||||
LINT!$LINT$ac_delim
|
LINT!$LINT$ac_delim
|
||||||
LINTFLAGS!$LINTFLAGS$ac_delim
|
LINTFLAGS!$LINTFLAGS$ac_delim
|
||||||
|
@ -23224,7 +23228,7 @@ LIBOBJS!$LIBOBJS$ac_delim
|
||||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||||
_ACEOF
|
_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
|
break
|
||||||
elif $ac_last_try; then
|
elif $ac_last_try; then
|
||||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||||
|
|
|
@ -158,6 +158,7 @@ fi
|
||||||
AC_CHECK_TOOLS(AS,[gas as],as)
|
AC_CHECK_TOOLS(AS,[gas as],as)
|
||||||
AC_CHECK_TOOL(LD,ld,ld)
|
AC_CHECK_TOOL(LD,ld,ld)
|
||||||
AC_CHECK_TOOL(AR,ar,ar)
|
AC_CHECK_TOOL(AR,ar,ar)
|
||||||
|
AC_SUBST(ARFLAGS,rc)
|
||||||
AC_PROG_RANLIB
|
AC_PROG_RANLIB
|
||||||
AC_CHECK_TOOL(STRIP,strip,strip)
|
AC_CHECK_TOOL(STRIP,strip,strip)
|
||||||
AC_CHECK_TOOL(WINDRES,windres,false)
|
AC_CHECK_TOOL(WINDRES,windres,false)
|
||||||
|
|
|
@ -52,7 +52,7 @@ lib$(BASEMODULE).def: $(MAINSPEC)
|
||||||
|
|
||||||
lib$(BASEMODULE).def.a: $(IMPLIB_OBJS)
|
lib$(BASEMODULE).def.a: $(IMPLIB_OBJS)
|
||||||
$(RM) $@
|
$(RM) $@
|
||||||
$(AR) $@ $(IMPLIB_OBJS)
|
$(AR) $(ARFLAGS) $@ $(IMPLIB_OBJS)
|
||||||
$(RANLIB) $@
|
$(RANLIB) $@
|
||||||
|
|
||||||
lib$(BASEMODULE).a: $(SPEC_DEF) $(IMPLIB_OBJS)
|
lib$(BASEMODULE).a: $(SPEC_DEF) $(IMPLIB_OBJS)
|
||||||
|
|
|
@ -18,7 +18,7 @@ all: $(MODULE)
|
||||||
|
|
||||||
$(MODULE): $(OBJS) Makefile.in
|
$(MODULE): $(OBJS) Makefile.in
|
||||||
$(RM) $@
|
$(RM) $@
|
||||||
$(AR) $@ $(OBJS)
|
$(AR) $(ARFLAGS) $@ $(OBJS)
|
||||||
$(RANLIB) $@
|
$(RANLIB) $@
|
||||||
|
|
||||||
# Rules for installation
|
# Rules for installation
|
||||||
|
|
|
@ -36,7 +36,7 @@ all: $(MODULE)
|
||||||
|
|
||||||
$(MODULE): $(OBJS) Makefile.in
|
$(MODULE): $(OBJS) Makefile.in
|
||||||
$(RM) $@
|
$(RM) $@
|
||||||
$(AR) $@ $(OBJS)
|
$(AR) $(ARFLAGS) $@ $(OBJS)
|
||||||
$(RANLIB) $@
|
$(RANLIB) $@
|
||||||
|
|
||||||
@DEPENDENCIES@ # everything below this line is overwritten by make depend
|
@DEPENDENCIES@ # everything below this line is overwritten by make depend
|
||||||
|
|
|
@ -17,7 +17,7 @@ all: $(MODULE)
|
||||||
|
|
||||||
$(MODULE): $(OBJS)
|
$(MODULE): $(OBJS)
|
||||||
$(RM) $@
|
$(RM) $@
|
||||||
$(AR) $@ $(OBJS)
|
$(AR) $(ARFLAGS) $@ $(OBJS)
|
||||||
$(RANLIB) $@
|
$(RANLIB) $@
|
||||||
|
|
||||||
ppy.tab.c: ppy.tab.h # for parallel makes
|
ppy.tab.c: ppy.tab.h # for parallel makes
|
||||||
|
|
Loading…
Reference in New Issue