diff options
author | Werner Koch <wk@gnupg.org> | 2014-01-09 19:14:09 +0100 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2014-01-10 17:16:13 +0100 |
commit | a9c9aaca70c770cf5f9d05ce2417343490e45627 (patch) | |
tree | 5f2aff8aa4585d4bce7435bee819a8465afd6d92 | |
parent | e78abe490ff6806f8083b23075ae036e5894513a (diff) | |
download | libassuan-a9c9aaca70c770cf5f9d05ce2417343490e45627.tar.gz |
Move helper scripts to build-aux.
* compile, config.guess, config.rpath, config.sub, depcomp, ltmain.sh
* doc/mdate-sh, doc/texinfo.tex, install-sh, missing: Move to
build-aux/.
* Makefile.am (EXTRA_DIST): Remove config.rpath - it is implicitly
distributed.
* configure.ac (AC_CONFIG_AUX_DIR): New.
(AM_SILENT_RULES): New.
-rw-r--r-- | Makefile.am | 2 | ||||
-rwxr-xr-x | build-aux/compile (renamed from compile) | 0 | ||||
-rwxr-xr-x | build-aux/config.guess (renamed from config.guess) | 0 | ||||
-rwxr-xr-x | build-aux/config.rpath (renamed from config.rpath) | 0 | ||||
-rwxr-xr-x | build-aux/config.sub (renamed from config.sub) | 0 | ||||
-rwxr-xr-x | build-aux/depcomp (renamed from depcomp) | 0 | ||||
-rwxr-xr-x | build-aux/install-sh (renamed from install-sh) | 0 | ||||
-rwxr-xr-x | build-aux/ltmain.sh (renamed from ltmain.sh) | 1 | ||||
-rwxr-xr-x | build-aux/mdate-sh (renamed from doc/mdate-sh) | 0 | ||||
-rwxr-xr-x | build-aux/missing (renamed from missing) | 0 | ||||
-rw-r--r-- | build-aux/texinfo.tex (renamed from doc/texinfo.tex) | 24 | ||||
-rw-r--r-- | configure.ac | 2 |
12 files changed, 15 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 7b328f1..8ab5547 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip # (A suitable gitlog-to-changelog script can be found in GnuPG master.) GITLOG_TO_CHANGELOG=gitlog-to-changelog -EXTRA_DIST = config.rpath autogen.sh README.GIT \ +EXTRA_DIST = autogen.sh README.GIT \ ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \ tests/ChangeLog-2011 contrib/ChangeLog-2011 \ build-aux/git-log-footer build-aux/git-log-fix diff --git a/compile b/build-aux/compile index 531136b..531136b 100755 --- a/compile +++ b/build-aux/compile diff --git a/config.guess b/build-aux/config.guess index 9afd676..9afd676 100755 --- a/config.guess +++ b/build-aux/config.guess diff --git a/config.rpath b/build-aux/config.rpath index c38b914..c38b914 100755 --- a/config.rpath +++ b/build-aux/config.rpath diff --git a/config.sub b/build-aux/config.sub index 61cb4bc..61cb4bc 100755 --- a/config.sub +++ b/build-aux/config.sub diff --git a/depcomp b/build-aux/depcomp index 91d4bf8..91d4bf8 100755 --- a/depcomp +++ b/build-aux/depcomp diff --git a/install-sh b/build-aux/install-sh index 377bb86..377bb86 100755 --- a/install-sh +++ b/build-aux/install-sh diff --git a/ltmain.sh b/build-aux/ltmain.sh index 07bf696..f8c3614 100755 --- a/ltmain.sh +++ b/build-aux/ltmain.sh @@ -9675,4 +9675,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # sh-indentation:2 # End: # vi:sw=2 - diff --git a/doc/mdate-sh b/build-aux/mdate-sh index 07fadc1..07fadc1 100755 --- a/doc/mdate-sh +++ b/build-aux/mdate-sh diff --git a/missing b/build-aux/missing index 64b5f90..64b5f90 100755 --- a/missing +++ b/build-aux/missing diff --git a/doc/texinfo.tex b/build-aux/texinfo.tex index 60148b7..13ee0e4 100644 --- a/doc/texinfo.tex +++ b/build-aux/texinfo.tex @@ -20,7 +20,7 @@ % General Public License for more details. % % You should have received a copy of the GNU General Public License -% along with this texinfo.tex file; see the file COPYING. If not, +% along with this texinfo.tex file; see the file COPYING. If not, % see <http://www.gnu.org/licenses/>. % % As a special exception, when this file is read by TeX when processing @@ -1932,7 +1932,7 @@ where each line of input produces a line of output.} % @acronym for "FBI", "NATO", and the like. % We print this one point size smaller, since it's intended for % all-uppercase. -% +% \def\acronym#1{\doacronym #1,,\finish} \def\doacronym#1,#2,#3\finish{% {\selectfonts\lsize #1}% @@ -1944,7 +1944,7 @@ where each line of input produces a line of output.} % @abbr for "Comput. J." and the like. % No font change, but don't do end-of-sentence spacing. -% +% \def\abbr#1{\doabbr #1,,\finish} \def\doabbr#1,#2,#3\finish{% {\frenchspacing #1}% @@ -1971,7 +1971,7 @@ where each line of input produces a line of output.} % Laurent Siebenmann reports \Orb undefined with: % Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 % so we'll define it if necessary. -% +% \ifx\Orb\undefined \def\Orb{\mathhexbox20D} \fi @@ -2287,7 +2287,7 @@ where each line of input produces a line of output.} % cause the example and the item to crash together. So we use this % bizarre value of 10001 as a signal to \aboveenvbreak to insert % \parskip glue after all. Section titles are handled this way also. - % + % \penalty 10001 \endgroup \itemxneedsnegativevskipfalse @@ -3437,7 +3437,7 @@ where each line of input produces a line of output.} % to re-insert the same penalty (values >10000 are used for various % signals); since we just inserted a non-discardable item, any % following glue (such as a \parskip) would be a breakpoint. For example: - % + % % @deffn deffn-whatever % @vindex index-whatever % Description. @@ -4377,11 +4377,11 @@ where each line of input produces a line of output.} % glue accumulate. (Not a breakpoint because it's preceded by a % discardable item.) \vskip-\parskip - % + % % This is purely so the last item on the list is a known \penalty > % 10000. This is so \startdefun can avoid allowing breakpoints after % section headings. Otherwise, it would insert a valid breakpoint between: - % + % % @section sec-whatever % @deffn def-whatever \penalty 10001 @@ -5129,7 +5129,7 @@ where each line of input produces a line of output.} % by \defargscommonending, instead of 10000, since the sectioning % commands also insert a nobreak penalty, and we don't want to allow % a break between a section heading and a defun. - % + % \ifnum\lastpenalty=10002 \penalty2000 \fi % % Similarly, after a section heading, do not allow a break. @@ -5497,7 +5497,7 @@ where each line of input produces a line of output.} % This does \let #1 = #2, with \csnames; that is, % \let \csname#1\endcsname = \csname#2\endcsname % (except of course we have to play expansion games). -% +% \def\cslet#1#2{% \expandafter\let \csname#1\expandafter\endcsname @@ -5750,11 +5750,11 @@ where each line of input produces a line of output.} % is the best we can do for now. makeinfo does not expand macros in the % argument to @deffn, which ends up writing an index entry, and texindex % isn't prepared for an index sort entry that starts with \. -% +% % Since macro invocations are followed by braces, we can just redefine them % to take a single TeX argument. The case of a macro invocation that % goes to end-of-line is not handled. -% +% \def\emptyusermacros{\begingroup \def\do##1{\let\noexpand##1=\noexpand\asis}% \edef\next{\macrolist}\expandafter\endgroup\next} diff --git a/configure.ac b/configure.ac index de2347f..2e3b197 100644 --- a/configure.ac +++ b/configure.ac @@ -70,12 +70,14 @@ AC_SUBST(LIBASSUAN_LT_REVISION) PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION +AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE AM_MAINTAINER_MODE AC_CONFIG_SRCDIR(src/assuan.h.in) AC_CONFIG_MACRO_DIR(m4) AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST +AM_SILENT_RULES AB_INIT AC_GNU_SOURCE |