mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
Modernize to automake 1.14.
* Makefile.am (AUTOMAKE_OPTIONS): Move to ... * configure.ac (AM_INIT_AUTOMAKE): here and add serial-tests. * keyserver/Makefile.am: Replace INCLUDES by AM_CPPFLAGS. * mpi/Makefile.am: Ditto. * util/Makefile.am: Ditto. * keyserver/Makefile.am: Ditto. Adjusted other things. * m4/intl.m4, m4/po.m4: Use autoconf's AC_PROG_MKDIR_P.
This commit is contained in:
Werner Koch
parent
8adb5ff260
commit
592e1aa407
@ -22,7 +22,6 @@ ACLOCAL_AMFLAGS = -I m4
|
||||
# tests are importing secret keys and that is not allowed if
|
||||
# selinux-support is enabled.
|
||||
DISTCHECK_CONFIGURE_FLAGS = --enable-mailto
|
||||
AUTOMAKE_OPTIONS = dist-bzip2 filename-length-max=99
|
||||
|
||||
GITLOG_TO_CHANGELOG=gitlog-to-changelog
|
||||
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
If you are building from Subversion, run the script
|
||||
If you are building from GIT, run the script
|
||||
|
||||
./autogen.sh
|
||||
|
||||
first, to make sure that you have all the necessary maintainer tools
|
||||
are installed and to build the actual configuration files. Then run
|
||||
are installed and to build the actual configuration files. If you
|
||||
have just checked out from GIT, you should add the option "--force" to
|
||||
autogen.sh so that meta data is noticed by autom4te.cache. Then run
|
||||
|
||||
./configure --enable-maintainer-mode
|
||||
|
||||
@ -14,9 +16,9 @@ tools, or the tools are not installed, you may use environment
|
||||
variables to override the default tool names:
|
||||
|
||||
AUTOMAKE_SUFFIX is used as a suffix for all tools from the automake
|
||||
package. For example
|
||||
AUTOMAKE_SUFFIX="-1.7" ./autogen.sh
|
||||
uses "automake-1.7" and "aclocal-1.7.
|
||||
package. For example
|
||||
AUTOMAKE_SUFFIX="-1.14" ./autogen.sh
|
||||
uses "automake-1.14" and "aclocal-1.14.
|
||||
AUTOMAKE_PREFIX is used as a prefix for all tools from the automake
|
||||
page and may be combined with AUTOMAKE_SUFFIX. e.g.:
|
||||
AUTOMAKE_PREFIX=/usr/foo/bin ./autogen.sh
|
||||
@ -35,17 +37,13 @@ It is also possible to use the variable name AUTOMAKE, AUTOCONF,
|
||||
ACLOCAL, AUTOHEADER, GETTEXT and MSGMERGE to directly specify the name
|
||||
of the programs to run. It is however better to use the suffix and
|
||||
prefix forms as described above because that does not require
|
||||
knowledge about the actual tools used by autgen.sh.
|
||||
knowledge about the actual tools used by autogen.sh.
|
||||
|
||||
|
||||
Please don't use autopoint, libtoolize or autoreconf unless you are
|
||||
the current maintainer and want to update the standard configuration
|
||||
files. All those files should be in the repository and only updated
|
||||
manually if the maintainer decides that newer versions are required.
|
||||
The maintainer should also make sure that the required version of
|
||||
automake et al. are properly indicated at the top of configure.ac and
|
||||
take care to copy the files and not merely use symlinks.
|
||||
|
||||
|
||||
|
||||
|
||||
files. All those files should be in GIT and only updated manually
|
||||
if the maintainer decides that newer versions are required. The
|
||||
maintainer should also make sure that the required version of automake
|
||||
et al. are properly indicated at the top of configure.ac and take care
|
||||
to copy the files and not merely use symlinks.
|
||||
@ -20,8 +20,8 @@
|
||||
#
|
||||
# (Process this file with autoconf to produce a configure script.)
|
||||
|
||||
AC_PREREQ(2.59)
|
||||
min_automake_version="1.9.3"
|
||||
AC_PREREQ(2.61)
|
||||
min_automake_version="1.14"
|
||||
|
||||
# To build a release you need to create a tag with the version number
|
||||
# (git tag -s gnupg-1.n.m) and run "./autogen.sh --force". Please
|
||||
@ -51,7 +51,7 @@ development_version=mym4_isgit
|
||||
AC_CONFIG_AUX_DIR(scripts)
|
||||
AC_CONFIG_SRCDIR(g10/gpg.c)
|
||||
AC_CANONICAL_HOST
|
||||
AM_INIT_AUTOMAKE([std-options])
|
||||
AM_INIT_AUTOMAKE([serial-tests std-options dist-bzip2 filename-length-max=99])
|
||||
AB_INIT
|
||||
AC_CONFIG_HEADERS(config.h)
|
||||
|
||||
|
||||
@ -7,17 +7,17 @@
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
#
|
||||
# GnuPG is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/intl
|
||||
EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp gpgkeys_finger gpgkeys_curl
|
||||
EXTRA_SCRIPTS = gpgkeys_mailto
|
||||
|
||||
@ -34,23 +34,26 @@ gpgkeys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h
|
||||
|
||||
other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
|
||||
|
||||
gpgkeys_ldap_CPPFLAGS = @LDAP_CPPFLAGS@
|
||||
gpgkeys_ldap_CPPFLAGS = $(AM_CPPFLAGS) $(LDAP_CPPFLAGS)
|
||||
gpgkeys_ldap_LDADD = ../util/libcompat.a @LDAPLIBS@ @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
|
||||
|
||||
gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
|
||||
|
||||
if FAKE_CURL
|
||||
gpgkeys_curl_SOURCES += curl-shim.c curl-shim.h
|
||||
gpgkeys_curl_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
gpgkeys_curl_LDADD = ../util/libutil.a @NETLIBS@ @DNSLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
|
||||
gpgkeys_hkp_SOURCES += curl-shim.c curl-shim.h
|
||||
gpgkeys_hkp_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @DNSLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
|
||||
gpgkeys_finger_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
else
|
||||
gpgkeys_curl_SOURCES += ksmalloc.c
|
||||
gpgkeys_curl_CPPFLAGS = @LIBCURL_CPPFLAGS@
|
||||
gpgkeys_curl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCURL_CPPFLAGS)
|
||||
gpgkeys_curl_LDADD = ../util/libcompat.a @LIBCURL@ @GETOPT@
|
||||
gpgkeys_hkp_SOURCES += ksmalloc.c
|
||||
gpgkeys_hkp_CPPFLAGS = @LIBCURL_CPPFLAGS@
|
||||
gpgkeys_hkp_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCURL_CPPFLAGS)
|
||||
gpgkeys_hkp_LDADD = ../util/libcompat.a @DNSLIBS@ @LIBCURL@ @GETOPT@
|
||||
gpgkeys_finger_CPPFLAGS = @LIBCURL_CPPFLAGS@
|
||||
gpgkeys_ldap_CPPFLAGS += @LIBCURL_CPPFLAGS@
|
||||
gpgkeys_finger_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCURL_CPPFLAGS)
|
||||
gpgkeys_ldap_CPPFLAGS += $(LIBCURL_CPPFLAGS)
|
||||
endif
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# intl.m4 serial 17 (gettext-0.18)
|
||||
# intl.m4 serial 17 (gettext-0.18) - updated by wk 2015-01-19
|
||||
dnl Copyright (C) 1995-2009 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
@ -25,7 +25,7 @@ dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
|
||||
AC_DEFUN([AM_INTL_SUBDIR],
|
||||
[
|
||||
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
||||
AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
|
||||
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
|
||||
AC_REQUIRE([AC_PROG_CC])dnl
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
AC_REQUIRE([gt_GLIBC2])dnl
|
||||
|
||||
4
m4/po.m4
4
m4/po.m4
@ -1,4 +1,4 @@
|
||||
# po.m4 serial 17 (gettext-0.18)
|
||||
# po.m4 serial 17 (gettext-0.18) updated by wk 2015-01-19
|
||||
dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
|
||||
[
|
||||
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
||||
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
||||
AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
|
||||
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
|
||||
AC_REQUIRE([AM_NLS])dnl
|
||||
|
||||
dnl Release version of the gettext macros. This is used to ensure that
|
||||
|
||||
@ -6,18 +6,18 @@
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
#
|
||||
# GnuPG is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
|
||||
INCLUDES = -I.. -I$(top_srcdir)/include
|
||||
AM_CPPFLAGS = -I.. -I$(top_srcdir)/include
|
||||
AM_CFLAGS = $(MPI_OPT_FLAGS)
|
||||
AM_CCASFLAGS = $(NOEXECSTACK_FLAGS) $(MPI_SFLAGS)
|
||||
|
||||
|
||||
@ -7,17 +7,17 @@
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
#
|
||||
# GnuPG is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
|
||||
AM_CPPFLAGS= -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
|
||||
|
||||
noinst_LIBRARIES = libutil.a libcompat.a
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user