[Pkg-privacy-commits] [libotr] 190/225: Modernize autoconf build system
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 12:45:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository libotr.
commit b0da3f58b6bc9e86e17292699b083c197c8d2af9
Author: David Goulet <dgoulet at ev0ke.net>
Date: Tue Jun 3 09:01:53 2014 -0400
Modernize autoconf build system
The most important feature here is that the compilation is now silent
thus it's now much more easier to spot warnings/errors by the compiler.
To make it verbose, simply use "make V=1".
Fixes #11
Signed-off-by: David Goulet <dgoulet at ev0ke.net>
---
Makefile.am | 2 ++
configure.ac | 27 ++++++++++++++++++---------
src/Makefile.am | 2 +-
toolkit/Makefile.am | 2 +-
4 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d2944fb..7e44beb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I config
+
SUBDIRS = src toolkit
EXTRA_DIST = Protocol-v3.html UPGRADING packaging libotr.m4 libotr.pc.in
diff --git a/configure.ac b/configure.ac
index ccaaffd..f946e86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,5 @@
dnl Process this file with autoconf to produce configure.
-AC_INIT(toolkit/parse.c)
-
-AM_CONFIG_HEADER(config.h)
-
dnl Notes on version numbering:
dnl For an implementation-only change:
dnl Change the libotr package version from a.b.c to a.b.(c+1)
@@ -15,16 +11,22 @@ dnl [Note that this does *not* change the major number of the .so.]
dnl For a backwards-incompatible API change (e.g. changing data structures):
dnl Change the libotr package version from a.b.c to (a+1).0.0
dnl Change the libotr libtool version from x:y:z to (x+1):0:0
+AC_INIT([libotr],[4.0.0],[otr at cypherpunks.ca],[],[https://otr.cypherpunks.ca])
+
+AM_CONFIG_HEADER(config.h)
+AC_CONFIG_AUX_DIR([config])
-AM_INIT_AUTOMAKE(libotr, 4.0.0)
+AM_INIT_AUTOMAKE
LIBOTR_LIBTOOL_VERSION="5:0:0"
+AC_CONFIG_MACRO_DIR([config])
+# Silent compilation so warnings can be spotted.
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
AC_SUBST(LIBOTR_LIBTOOL_VERSION)
AC_PROG_CC
-
-
-AM_PROG_LIBTOOL
+LT_INIT
AM_PATH_LIBGCRYPT(1:1.2.0,,AC_MSG_ERROR(libgcrypt 1.2.0 or newer is required.))
@@ -168,4 +170,11 @@ if test x$enable_linker_hardening != xno; then
OTR_CHECK_LDFLAGS(-z relro -z now, "$all_ldflags_for_check", "$all_libs_for_check")
fi
-AC_OUTPUT([Makefile src/Makefile toolkit/Makefile libotr.pc])
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ toolkit/Makefile
+ libotr.pc
+])
+
+AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 96e7ce6..c2146cf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = @LIBGCRYPT_CFLAGS@
+AM_CPPFLAGS = @LIBGCRYPT_CFLAGS@
lib_LTLIBRARIES = libotr.la
diff --git a/toolkit/Makefile.am b/toolkit/Makefile.am
index 1cdb37b..4c069fb 100644
--- a/toolkit/Makefile.am
+++ b/toolkit/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@
+AM_CPPFLAGS = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@
noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/libotr.git
More information about the Pkg-privacy-commits
mailing list