Skip to content

Commit d2ed8e8

Browse files
wilxwilx
committed
Update to Automake 1.12.5.
1 parent 06842d6 commit d2ed8e8

File tree

28 files changed

+47
-37
lines changed

28 files changed

+47
-37
lines changed

‎Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.12.4 from Makefile.am.
1+
# Makefile.in generated by automake 1.12.5 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994-2012 Free Software Foundation, Inc.

‎aclocal.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
22

33
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
44

@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
3434
[am__api_version='1.12'
3535
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
3636
dnl require some minimum version. Point them to the right macro.
37-
m4_if([$1], [1.12.4], [],
37+
m4_if([$1], [1.12.5], [],
3838
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
3939
])
4040

@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
5050
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
5151
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
5252
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
53-
[AM_AUTOMAKE_VERSION([1.12.4])dnl
53+
[AM_AUTOMAKE_VERSION([1.12.5])dnl
5454
m4_ifndef([AC_AUTOCONF_VERSION],
5555
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
5656
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

‎config.sub

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
55
# 2011, 2012 Free Software Foundation, Inc.
66

7-
timestamp='2012-08-18'
7+
timestamp='2012-10-10'
88

99
# This file is (in principle) common to ALL GNU software.
1010
# The presence of a machine in this file suggests that SOME GNU software
@@ -156,7 +156,7 @@ case $os in
156156
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
157157
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
158158
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
159-
-apple | -axis | -knuth | -cray | -microblaze)
159+
-apple | -axis | -knuth | -cray | -microblaze*)
160160
os=
161161
basic_machine=$1
162162
;;
@@ -259,8 +259,10 @@ case $basic_machine in
259259
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
260260
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
261261
| am33_2.0 \
262-
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
263-
| be32 | be64 \
262+
| arc \
263+
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
264+
| avr | avr32 \
265+
| be32 | be64 \
264266
| bfin \
265267
| c4x | clipper \
266268
| d10v | d30v | dlx | dsp16xx \
@@ -273,7 +275,7 @@ case $basic_machine in
273275
| le32 | le64 \
274276
| lm32 \
275277
| m32c | m32r | m32rle | m68000 | m68k | m88k \
276-
| maxq | mb | microblaze | mcore | mep | metag \
278+
| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
277279
| mips | mipsbe | mipseb | mipsel | mipsle \
278280
| mips16 \
279281
| mips64 | mips64el \
@@ -389,7 +391,8 @@ case $basic_machine in
389391
| lm32-* \
390392
| m32c-* | m32r-* | m32rle-* \
391393
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
392-
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
394+
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
395+
| microblaze-* | microblazeel-* \
393396
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
394397
| mips16-* \
395398
| mips64-* | mips64el-* \
@@ -788,7 +791,7 @@ case $basic_machine in
788791
basic_machine=ns32k-utek
789792
os=-sysv
790793
;;
791-
microblaze)
794+
microblaze*)
792795
basic_machine=microblaze-xilinx
793796
;;
794797
mingw64)

‎depcomp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
7474

7575
rm -f "$tmpdepfile"
7676

77+
# Avoid interferences from the environment.
78+
gccflag= dashmflag=
79+
7780
# Some modes work just like other modes, but use different flags. We
7881
# parameterize here, but still list the modes in the big case below,
7982
# to make depend.m4 easier to write. Note that we *cannot* use a case
@@ -108,7 +111,7 @@ if test "$depmode" = msvc7msys; then
108111
fi
109112

110113
if test "$depmode" = xlc; then
111-
# IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
114+
# IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
112115
gccflag=-qmakedep=gcc,-MF
113116
depmode=gcc
114117
fi
@@ -142,13 +145,17 @@ gcc3)
142145
;;
143146

144147
gcc)
148+
## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
149+
## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
150+
## (see the conditional assignment to $gccflag above).
145151
## There are various ways to get dependency output from gcc. Here's
146152
## why we pick this rather obscure method:
147153
## - Don't want to use -MD because we'd like the dependencies to end
148154
## up in a subdir. Having to rename by hand is ugly.
149155
## (We might end up doing this anyway to support other compilers.)
150156
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
151-
## -MM, not -M (despite what the docs say).
157+
## -MM, not -M (despite what the docs say). Also, it might not be
158+
## supported by the other compilers which use the 'gcc' depmode.
152159
## - Using -M directly means running the compiler twice (even worse
153160
## than renaming).
154161
if test -z "$gccflag"; then

‎include/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.12.4 from Makefile.am.
1+
# Makefile.in generated by automake 1.12.5 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994-2012 Free Software Foundation, Inc.

‎loggingserver/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.12.4 from Makefile.am.
1+
# Makefile.in generated by automake 1.12.5 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994-2012 Free Software Foundation, Inc.

‎qt4debugappender/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.12.4 from Makefile.am.
1+
# Makefile.in generated by automake 1.12.5 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994-2012 Free Software Foundation, Inc.

‎scripts/doautoreconf.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
export AUTOMAKE_SUFFIX=-1.12.4
3+
export AUTOMAKE_SUFFIX=-1.12.5
44
export AUTOCONF_SUFFIX=-2.69
55
export LIBTOOL_SUFFIX=-2.4.2
66

‎src/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.12.4 from Makefile.am.
1+
# Makefile.in generated by automake 1.12.5 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994-2012 Free Software Foundation, Inc.

‎swig/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.12.4 from Makefile.am.
1+
# Makefile.in generated by automake 1.12.5 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994-2012 Free Software Foundation, Inc.

0 commit comments

Comments
 (0)