Skip to content

Commit 8c2ea5b

Browse files
author
michael
committed
update to automake 1.11.2
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1169 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
1 parent 33d1f71 commit 8c2ea5b

File tree

3 files changed

+78
-44
lines changed

3 files changed

+78
-44
lines changed

‎Makefile.in

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Makefile.in generated by automake 1.11.1 from Makefile.am.
1+
# Makefile.in generated by automake 1.11.2 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5-
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6-
# Inc.
5+
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6+
# Foundation, Inc.
77
# This Makefile.in is free software; the Free Software Foundation
88
# gives unlimited permission to copy and/or distribute it,
99
# with or without modifications, as long as this notice is preserved.
@@ -103,6 +103,8 @@ am__remove_distdir = \
103103
DIST_ARCHIVES = $(distdir).tar.gz
104104
GZIP_ENV = --best
105105
distuninstallcheck_listfiles = find . -type f -print
106+
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
107+
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
106108
distcleancheck_listfiles = find . -type f -print
107109
ACLOCAL = @ACLOCAL@
108110
AMTAR = @AMTAR@
@@ -422,7 +424,7 @@ all: config.h
422424

423425
.SUFFIXES:
424426
.SUFFIXES: .c .lo .o .obj
425-
am--refresh:
427+
am--refresh: Makefile
426428
@:
427429
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
428430
@for dep in $?; do \
@@ -458,10 +460,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
458460
$(am__aclocal_m4_deps):
459461

460462
config.h: stamp-h1
461-
@if test ! -f $@; then \
462-
rm -f stamp-h1; \
463-
$(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
464-
else :; fi
463+
@if test ! -f $@; then rm -f stamp-h1; else :; fi
464+
@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
465465

466466
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
467467
@rm -f stamp-h1
@@ -779,15 +779,15 @@ dist-gzip: distdir
779779
$(am__remove_distdir)
780780

781781
dist-bzip2: distdir
782-
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
782+
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
783783
$(am__remove_distdir)
784784

785785
dist-lzma: distdir
786786
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
787787
$(am__remove_distdir)
788788

789789
dist-xz: distdir
790-
tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
790+
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
791791
$(am__remove_distdir)
792792

793793
dist-tarZ: distdir
@@ -837,6 +837,7 @@ distcheck: dist
837837
&& am__cwd=`pwd` \
838838
&& $(am__cd) $(distdir)/_build \
839839
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
840+
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
840841
$(DISTCHECK_CONFIGURE_FLAGS) \
841842
&& $(MAKE) $(AM_MAKEFLAGS) \
842843
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -865,8 +866,16 @@ distcheck: dist
865866
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
866867
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
867868
distuninstallcheck:
868-
@$(am__cd) '$(distuninstallcheck_dir)' \
869-
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
869+
@test -n '$(distuninstallcheck_dir)' || { \
870+
echo 'ERROR: trying to run $@ with an empty' \
871+
'$$(distuninstallcheck_dir)' >&2; \
872+
exit 1; \
873+
}; \
874+
$(am__cd) '$(distuninstallcheck_dir)' || { \
875+
echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
876+
exit 1; \
877+
}; \
878+
test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
870879
|| { echo "ERROR: files left after uninstall:" ; \
871880
if test -n "$(DESTDIR)"; then \
872881
echo " (check DESTDIR support)"; \
@@ -899,10 +908,15 @@ install-am: all-am
899908

900909
installcheck: installcheck-am
901910
install-strip:
902-
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
903-
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
904-
`test -z '$(STRIP)' || \
905-
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
911+
if test -z '$(STRIP)'; then \
912+
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
913+
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
914+
install; \
915+
else \
916+
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
917+
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
918+
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
919+
fi
906920
mostlyclean-generic:
907921

908922
clean-generic:

‎aclocal.m4

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.11.2 -*- Autoconf -*-
22

33
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4-
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
4+
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
5+
# Inc.
56
# This file is free software; the Free Software Foundation
67
# gives unlimited permission to copy and/or distribute it,
78
# with or without modifications, as long as this notice is preserved.
@@ -10111,12 +10112,15 @@ else
1011110112
fi[]dnl
1011210113
])# PKG_CHECK_MODULES
1011310114
10114-
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
10115+
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
10116+
# Foundation, Inc.
1011510117
#
1011610118
# This file is free software; the Free Software Foundation
1011710119
# gives unlimited permission to copy and/or distribute it,
1011810120
# with or without modifications, as long as this notice is preserved.
1011910121
10122+
# serial 1
10123+
1012010124
# AM_AUTOMAKE_VERSION(VERSION)
1012110125
# ----------------------------
1012210126
# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -10126,7 +10130,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
1012610130
[am__api_version='1.11'
1012710131
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
1012810132
dnl require some minimum version. Point them to the right macro.
10129-
m4_if([$1], [1.11.1], [],
10133+
m4_if([$1], [1.11.2], [],
1013010134
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
1013110135
])
1013210136
@@ -10142,19 +10146,21 @@ m4_define([_AM_AUTOCONF_VERSION], [])
1014210146
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
1014310147
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
1014410148
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
10145-
[AM_AUTOMAKE_VERSION([1.11.1])dnl
10149+
[AM_AUTOMAKE_VERSION([1.11.2])dnl
1014610150
m4_ifndef([AC_AUTOCONF_VERSION],
1014710151
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
1014810152
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
1014910153
1015010154
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
1015110155
10152-
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
10156+
# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
1015310157
#
1015410158
# This file is free software; the Free Software Foundation
1015510159
# gives unlimited permission to copy and/or distribute it,
1015610160
# with or without modifications, as long as this notice is preserved.
1015710161
10162+
# serial 1
10163+
1015810164
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
1015910165
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
1016010166
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -10236,14 +10242,14 @@ AC_CONFIG_COMMANDS_PRE(
1023610242
Usually this means the macro was only invoked conditionally.]])
1023710243
fi])])
1023810244
10239-
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
10240-
# Free Software Foundation, Inc.
10245+
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
10246+
# 2010, 2011 Free Software Foundation, Inc.
1024110247
#
1024210248
# This file is free software; the Free Software Foundation
1024310249
# gives unlimited permission to copy and/or distribute it,
1024410250
# with or without modifications, as long as this notice is preserved.
1024510251
10246-
# serial 10
10252+
# serial 12
1024710253
1024810254
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
1024910255
# written in clear, in which case automake, when reading aclocal.m4,
@@ -10283,6 +10289,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
1028310289
# instance it was reported that on HP-UX the gcc test will end up
1028410290
# making a dummy file named `D' -- because `-MD' means `put the output
1028510291
# in D'.
10292+
rm -rf conftest.dir
1028610293
mkdir conftest.dir
1028710294
# Copy depcomp to subdir because otherwise we won't find it if we're
1028810295
# using a relative directory.
@@ -10347,7 +10354,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
1034710354
break
1034810355
fi
1034910356
;;
10350-
msvisualcpp | msvcmsys)
10357+
msvc7 | msvc7msys | msvisualcpp | msvcmsys)
1035110358
# This compiler won't grok `-c -o', but also, the minuso test has
1035210359
# not run yet. These depmodes are late enough in the game, and
1035310360
# so weak that their functioning should not be impacted.
@@ -10412,10 +10419,13 @@ AC_DEFUN([AM_DEP_TRACK],
1041210419
if test "x$enable_dependency_tracking" != xno; then
1041310420
am_depcomp="$ac_aux_dir/depcomp"
1041410421
AMDEPBACKSLASH='\'
10422+
am__nodep='_no'
1041510423
fi
1041610424
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
1041710425
AC_SUBST([AMDEPBACKSLASH])dnl
1041810426
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
10427+
AC_SUBST([am__nodep])dnl
10428+
_AM_SUBST_NOTMAKE([am__nodep])dnl
1041910429
])
1042010430
1042110431
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -10499,20 +10509,19 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
1049910509
])
1050010510
1050110511
10502-
# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2005
10512+
# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2010
1050310513
# Free Software Foundation, Inc.
1050410514
#
1050510515
# This file is free software; the Free Software Foundation
1050610516
# gives unlimited permission to copy and/or distribute it,
1050710517
# with or without modifications, as long as this notice is preserved.
1050810518
10509-
# serial 3
10519+
# serial 4
1051010520
1051110521
AC_DEFUN([AM_WITH_DMALLOC],
1051210522
[AC_MSG_CHECKING([if malloc debugging is wanted])
1051310523
AC_ARG_WITH(dmalloc,
10514-
[ --with-dmalloc use dmalloc, as in
10515-
http://www.dmalloc.com/dmalloc.tar.gz],
10524+
[ --with-dmalloc use dmalloc, as in http://www.dmalloc.com],
1051610525
[if test "$withval" = yes; then
1051710526
AC_MSG_RESULT(yes)
1051810527
AC_DEFINE(WITH_DMALLOC,1,
@@ -10677,12 +10686,15 @@ for _am_header in $config_headers :; do
1067710686
done
1067810687
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
1067910688
10680-
# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
10689+
# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
10690+
# Inc.
1068110691
#
1068210692
# This file is free software; the Free Software Foundation
1068310693
# gives unlimited permission to copy and/or distribute it,
1068410694
# with or without modifications, as long as this notice is preserved.
1068510695
10696+
# serial 1
10697+
1068610698
# AM_PROG_INSTALL_SH
1068710699
# ------------------
1068810700
# Define $install_sh.
@@ -10814,12 +10826,15 @@ else
1081410826
fi
1081510827
])
1081610828
10817-
# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
10829+
# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
10830+
# Inc.
1081810831
#
1081910832
# This file is free software; the Free Software Foundation
1082010833
# gives unlimited permission to copy and/or distribute it,
1082110834
# with or without modifications, as long as this notice is preserved.
1082210835
10836+
# serial 1
10837+
1082310838
# AM_PROG_MKDIR_P
1082410839
# ---------------
1082510840
# Check for `mkdir -p'.
@@ -10842,27 +10857,28 @@ esac
1084210857
1084310858
# Helper functions for option handling. -*- Autoconf -*-
1084410859
10845-
# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
10860+
# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
10861+
# Foundation, Inc.
1084610862
#
1084710863
# This file is free software; the Free Software Foundation
1084810864
# gives unlimited permission to copy and/or distribute it,
1084910865
# with or without modifications, as long as this notice is preserved.
1085010866
10851-
# serial 4
10867+
# serial 5
1085210868
1085310869
# _AM_MANGLE_OPTION(NAME)
1085410870
# -----------------------
1085510871
AC_DEFUN([_AM_MANGLE_OPTION],
1085610872
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
1085710873
1085810874
# _AM_SET_OPTION(NAME)
10859-
# ------------------------------
10875+
# --------------------
1086010876
# Set option NAME. Presently that only means defining a flag for this option.
1086110877
AC_DEFUN([_AM_SET_OPTION],
1086210878
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
1086310879
1086410880
# _AM_SET_OPTIONS(OPTIONS)
10865-
# ----------------------------------
10881+
# ------------------------
1086610882
# OPTIONS is a space-separated list of Automake options.
1086710883
AC_DEFUN([_AM_SET_OPTIONS],
1086810884
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -10938,12 +10954,14 @@ Check your system clock])
1093810954
fi
1093910955
AC_MSG_RESULT(yes)])
1094010956
10941-
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
10957+
# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
1094210958
#
1094310959
# This file is free software; the Free Software Foundation
1094410960
# gives unlimited permission to copy and/or distribute it,
1094510961
# with or without modifications, as long as this notice is preserved.
1094610962
10963+
# serial 1
10964+
1094710965
# AM_PROG_INSTALL_STRIP
1094810966
# ---------------------
1094910967
# One issue with vendor `install' (even GNU) is that you can't
@@ -10966,13 +10984,13 @@ fi
1096610984
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1096710985
AC_SUBST([INSTALL_STRIP_PROGRAM])])
1096810986
10969-
# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
10987+
# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
1097010988
#
1097110989
# This file is free software; the Free Software Foundation
1097210990
# gives unlimited permission to copy and/or distribute it,
1097310991
# with or without modifications, as long as this notice is preserved.
1097410992
10975-
# serial 2
10993+
# serial 3
1097610994
1097710995
# _AM_SUBST_NOTMAKE(VARIABLE)
1097810996
# ---------------------------
@@ -10981,7 +10999,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
1098110999
AC_DEFUN([_AM_SUBST_NOTMAKE])
1098211000
1098311001
# AM_SUBST_NOTMAKE(VARIABLE)
10984-
# ---------------------------
11002+
# --------------------------
1098511003
# Public sister of _AM_SUBST_NOTMAKE.
1098611004
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1098711005

0 commit comments

Comments
 (0)