Skip to content

Commit ab46bcc

Browse files
committed
Add autotools buildsystem
Should be functionally equivalent to the old Makefile, minus the logic to handle debug builds. Sources are split into a separate file for easier inclusion in downstream projects.
1 parent f3955be commit ab46bcc

19 files changed

+985
-136
lines changed

.gitignore

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
*.o
2+
*.lo
3+
*.la
4+
*.dll
5+
*.dylib
6+
*.so.*
7+
.*
8+
*.a
9+
*~
10+
11+
Makefile
12+
Makefile.in
13+
aclocal.m4
14+
autom4te.cache/
15+
build-aux/config.guess
16+
build-aux/config.sub
17+
build-aux/depcomp
18+
build-aux/install-sh
19+
build-aux/ltmain.sh
20+
build-aux/m4/libtool.m4
21+
build-aux/m4/lt~obsolete.m4
22+
build-aux/m4/ltoptions.m4
23+
build-aux/m4/ltsugar.m4
24+
build-aux/m4/ltversion.m4
25+
build-aux/missing
26+
build-aux/compile
27+
build-aux/test-driver
28+
config.log
29+
config.status
30+
configure
31+
libtool
32+
stamp-h1
33+
34+
test-exhaust
35+
bench

Makefile.am

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
ACLOCAL_AMFLAGS = -I build-aux/m4
2+
AM_CXXFLAGS = $(WARN_CXXFLAGS) $(NOWARN_CXXFLAGS)
3+
4+
include sources.mk
5+
6+
include_HEADERS = $(MINISKETCH_DIST_HEADERS_INT)
7+
noinst_HEADERS = $(MINISKETCH_LIB_HEADERS_INT) $(MINISKETCH_FIELD_GENERIC_HEADERS_INT) $(MINISKETCH_FIELD_CLMUL_HEADERS_INT)
8+
9+
LIBMINISKETCH = libminisketch.la
10+
LIBMINISKETCH_FIELD_GENERIC = libminisketch_field_generic.la
11+
if ENABLE_CLMUL
12+
LIBMINISKETCH_FIELD_CLMUL = libminisketch_field_clmul.la
13+
endif
14+
if USE_TESTS
15+
LIBMINISKETCH_DEBUG=libminisketch_debug.la
16+
LIBMINISKETCH_FIELD_GENERIC_DEBUG=libminisketch_field_generic_debug.la
17+
if ENABLE_CLMUL
18+
LIBMINISKETCH_FIELD_CLMUL_DEBUG=libminisketch_field_clmul_debug.la
19+
endif
20+
endif
21+
22+
lib_LTLIBRARIES =
23+
lib_LTLIBRARIES += $(LIBMINISKETCH)
24+
25+
noinst_LTLIBRARIES =
26+
noinst_LTLIBRARIES += $(LIBMINISKETCH_FIELD_GENERIC)
27+
noinst_LTLIBRARIES += $(LIBMINISKETCH_FIELD_GENERIC_DEBUG)
28+
noinst_LTLIBRARIES += $(LIBMINISKETCH_FIELD_CLMUL)
29+
noinst_LTLIBRARIES += $(LIBMINISKETCH_FIELD_CLMUL_DEBUG)
30+
noinst_LTLIBRARIES += $(LIBMINISKETCH_DEBUG)
31+
32+
libminisketch_field_generic_la_SOURCES = $(MINISKETCH_FIELD_GENERIC_SOURCES_INT)
33+
34+
libminisketch_field_clmul_la_SOURCES = $(MINISKETCH_FIELD_CLMUL_SOURCES_INT)
35+
libminisketch_field_clmul_la_CXXFLAGS = $(AM_CXXFLAGS) $(CLMUL_CXXFLAGS)
36+
37+
38+
libminisketch_la_SOURCES = $(MINISKETCH_LIB_SOURCES_INT)
39+
libminisketch_la_LIBADD = $(LIBMINISKETCH_FIELD_CLMUL) $(LIBMINISKETCH_FIELD_GENERIC)
40+
41+
libminisketch_field_generic_debug_la_SOURCES = $(MINISKETCH_FIELD_GENERIC_SOURCES_INT)
42+
libminisketch_field_generic_debug_la_CPPFLAGS = $(AM_CPPFLAGS) -DMINISKETCH_VERIFY
43+
44+
libminisketch_field_clmul_debug_la_SOURCES = $(MINISKETCH_FIELD_CLMUL_SOURCES_INT)
45+
libminisketch_field_clmul_debug_la_CXXFLAGS = $(AM_CXXFLAGS) $(CLMUL_CXXFLAGS)
46+
libminisketch_field_clmul_debug_la_CPPFLAGS = $(AM_CPPFLAGS) -DMINISKETCH_VERIFY
47+
48+
49+
libminisketch_debug_la_SOURCES = $(MINISKETCH_LIB_SOURCES_INT)
50+
libminisketch_debug_la_CPPFLAGS = $(AM_CPPFLAGS) -DMINISKETCH_VERIFY
51+
libminisketch_debug_la_LIBADD = $(LIBMINISKETCH_FIELD_CLMUL_DEBUG) $(LIBMINISKETCH_FIELD_GENERIC_DEBUG)
52+
53+
noinst_PROGRAMS =
54+
if USE_BENCHMARK
55+
noinst_PROGRAMS += bench
56+
endif
57+
if USE_TESTS
58+
noinst_PROGRAMS += test-exhaust
59+
TESTS = test-exhaust
60+
endif
61+
62+
bench_SOURCES = $(MINISKETCH_BENCH_SOURCES_INT)
63+
bench_LDADD = $(LIBMINISKETCH)
64+
bench_LDFLAGS = $(AM_LDFLAGS) -static
65+
66+
test_exhaust_SOURCES = $(MINISKETCH_TEST_SOURCES_INT)
67+
test_exhaust_CPPFLAGS = $(AM_CPPFLAGS) -DMINISKETCH_VERIFY
68+
test_exhaust_LDADD = $(LIBMINISKETCH_DEBUG)
69+
test_exhaust_LDFLAGS = $(AM_LDFLAGS) -static
70+
71+
EXTRA_DIST=
72+
EXTRA_DIST += LICENSE
73+
EXTRA_DIST += README.md
74+
EXTRA_DIST += doc/example.c
75+
EXTRA_DIST += doc/gen_params.sage
76+
EXTRA_DIST += doc/math.md
77+
EXTRA_DIST += doc/moduli.md
78+
EXTRA_DIST += doc/plot_bits.png
79+
EXTRA_DIST += doc/plot_capacity.png
80+
EXTRA_DIST += doc/plot_diff.png
81+
EXTRA_DIST += doc/plot_size.png
82+
EXTRA_DIST += doc/protocoltips.md

autogen.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/sh
2+
# Copyright (c) 2013-2016 The Bitcoin Core developers
3+
# Distributed under the MIT software license, see the accompanying
4+
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
5+
6+
set -e
7+
srcdir="$(dirname $0)"
8+
cd "$srcdir"
9+
if [ -z ${LIBTOOLIZE} ] && GLIBTOOLIZE="`which glibtoolize 2>/dev/null`"; then
10+
LIBTOOLIZE="${GLIBTOOLIZE}"
11+
export LIBTOOLIZE
12+
fi
13+
which autoreconf >/dev/null || \
14+
(echo "configuration failed, please install autoconf first" && exit 1)
15+
autoreconf --install --force --warnings=all
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# ===========================================================================
2+
# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
3+
# ===========================================================================
4+
#
5+
# SYNOPSIS
6+
#
7+
# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
8+
#
9+
# DESCRIPTION
10+
#
11+
# Check whether the given FLAG works with the current language's compiler
12+
# or gives an error. (Warnings, however, are ignored)
13+
#
14+
# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
15+
# success/failure.
16+
#
17+
# If EXTRA-FLAGS is defined, it is added to the current language's default
18+
# flags (e.g. CFLAGS) when the check is done. The check is thus made with
19+
# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
20+
# force the compiler to issue an error when a bad flag is given.
21+
#
22+
# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
23+
#
24+
# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
25+
# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
26+
#
27+
# LICENSE
28+
#
29+
# Copyright (c) 2008 Guido U. Draheim <[email protected]>
30+
# Copyright (c) 2011 Maarten Bosmans <[email protected]>
31+
#
32+
# This program is free software: you can redistribute it and/or modify it
33+
# under the terms of the GNU General Public License as published by the
34+
# Free Software Foundation, either version 3 of the License, or (at your
35+
# option) any later version.
36+
#
37+
# This program is distributed in the hope that it will be useful, but
38+
# WITHOUT ANY WARRANTY; without even the implied warranty of
39+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
40+
# Public License for more details.
41+
#
42+
# You should have received a copy of the GNU General Public License along
43+
# with this program. If not, see <http://www.gnu.org/licenses/>.
44+
#
45+
# As a special exception, the respective Autoconf Macro's copyright owner
46+
# gives unlimited permission to copy, distribute and modify the configure
47+
# scripts that are the output of Autoconf when processing the Macro. You
48+
# need not follow the terms of the GNU General Public License when using
49+
# or distributing such scripts, even though portions of the text of the
50+
# Macro appear in them. The GNU General Public License (GPL) does govern
51+
# all other use of the material that constitutes the Autoconf Macro.
52+
#
53+
# This special exception to the GPL applies to versions of the Autoconf
54+
# Macro released by the Autoconf Archive. When you make and distribute a
55+
# modified version of the Autoconf Macro, you may extend this special
56+
# exception to the GPL to apply to your modified version as well.
57+
58+
#serial 4
59+
60+
AC_DEFUN([AX_CHECK_COMPILE_FLAG],
61+
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
62+
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
63+
AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
64+
ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
65+
_AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
66+
AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
67+
[AS_VAR_SET(CACHEVAR,[yes])],
68+
[AS_VAR_SET(CACHEVAR,[no])])
69+
_AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
70+
AS_VAR_IF(CACHEVAR,yes,
71+
[m4_default([$2], :)],
72+
[m4_default([$3], :)])
73+
AS_VAR_POPDEF([CACHEVAR])dnl
74+
])dnl AX_CHECK_COMPILE_FLAGS
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# ===========================================================================
2+
# http://www.gnu.org/software/autoconf-archive/ax_check_preproc_flag.html
3+
# ===========================================================================
4+
#
5+
# SYNOPSIS
6+
#
7+
# AX_CHECK_PREPROC_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
8+
#
9+
# DESCRIPTION
10+
#
11+
# Check whether the given FLAG works with the current language's
12+
# preprocessor or gives an error. (Warnings, however, are ignored)
13+
#
14+
# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
15+
# success/failure.
16+
#
17+
# If EXTRA-FLAGS is defined, it is added to the preprocessor's default
18+
# flags when the check is done. The check is thus made with the flags:
19+
# "CPPFLAGS EXTRA-FLAGS FLAG". This can for example be used to force the
20+
# preprocessor to issue an error when a bad flag is given.
21+
#
22+
# INPUT gives an alternative input source to AC_PREPROC_IFELSE.
23+
#
24+
# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
25+
# macro in sync with AX_CHECK_{COMPILE,LINK}_FLAG.
26+
#
27+
# LICENSE
28+
#
29+
# Copyright (c) 2008 Guido U. Draheim <[email protected]>
30+
# Copyright (c) 2011 Maarten Bosmans <[email protected]>
31+
#
32+
# This program is free software: you can redistribute it and/or modify it
33+
# under the terms of the GNU General Public License as published by the
34+
# Free Software Foundation, either version 3 of the License, or (at your
35+
# option) any later version.
36+
#
37+
# This program is distributed in the hope that it will be useful, but
38+
# WITHOUT ANY WARRANTY; without even the implied warranty of
39+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
40+
# Public License for more details.
41+
#
42+
# You should have received a copy of the GNU General Public License along
43+
# with this program. If not, see <http://www.gnu.org/licenses/>.
44+
#
45+
# As a special exception, the respective Autoconf Macro's copyright owner
46+
# gives unlimited permission to copy, distribute and modify the configure
47+
# scripts that are the output of Autoconf when processing the Macro. You
48+
# need not follow the terms of the GNU General Public License when using
49+
# or distributing such scripts, even though portions of the text of the
50+
# Macro appear in them. The GNU General Public License (GPL) does govern
51+
# all other use of the material that constitutes the Autoconf Macro.
52+
#
53+
# This special exception to the GPL applies to versions of the Autoconf
54+
# Macro released by the Autoconf Archive. When you make and distribute a
55+
# modified version of the Autoconf Macro, you may extend this special
56+
# exception to the GPL to apply to your modified version as well.
57+
58+
#serial 4
59+
60+
AC_DEFUN([AX_CHECK_PREPROC_FLAG],
61+
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
62+
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]cppflags_$4_$1])dnl
63+
AC_CACHE_CHECK([whether _AC_LANG preprocessor accepts $1], CACHEVAR, [
64+
ax_check_save_flags=$CPPFLAGS
65+
CPPFLAGS="$CPPFLAGS $4 $1"
66+
AC_PREPROC_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
67+
[AS_VAR_SET(CACHEVAR,[yes])],
68+
[AS_VAR_SET(CACHEVAR,[no])])
69+
CPPFLAGS=$ax_check_save_flags])
70+
AS_VAR_IF(CACHEVAR,yes,
71+
[m4_default([$2], :)],
72+
[m4_default([$3], :)])
73+
AS_VAR_POPDEF([CACHEVAR])dnl
74+
])dnl AX_CHECK_PREPROC_FLAGS

0 commit comments

Comments
 (0)