Skip to content

Commit

Permalink
Update Autotools setup
Browse files Browse the repository at this point in the history
- Move root autogen.sh to the one used by Bitcoin Core (very simple, unlike the current autogen.sh).
- Remove extra uses of C++11 flags.
- Silence make output unless "V=1" is used when using make.
- Rearrange some lines so that everything's a bit more cohesive, including moving #include files to CPPFLAGS (can be accessed in C and C++, and preprocessor means the effective output doesn't change).
- Further enforce C++11 compilation.
- m4 --> build-aux/m4
- Upgrade the C++11 M4 file to fix an Autotools warning, and include new files as needed to keep autoreconf happy.
- Set the minimum Automake version to 1.11 due to silent rule macro requirements. (1.11 came out in 2009, and I doubt Armory supports any pre-1.11 systems.)
- Add a patch to ax_gcc_x86_cpu_supports.m4 to silence an Autoconf warning ("serial 3" version with one change: AC_RUN_IFELSE --> AC_COMPILE_IFELSE).
- Update macOS build script to give users the ability to get verbose make output.
  • Loading branch information
droark committed Feb 14, 2018
1 parent b46f1ed commit df920a7
Show file tree
Hide file tree
Showing 19 changed files with 699 additions and 1,667 deletions.
6 changes: 4 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# Makefile for BitcoinArmory bitcoin wallet
# Makefile for Bitcoin Armory - Root Makefile
SUBDIRS = cppForSwig
bin_PROGRAMS =
noinst_PROGRAMS =

EXTRA_DIST = *.py *.md LICENSE LICENSE-ATI LICENSE-MIT \
nginx_example.conf imgList.xml autogen.sh \
armoryengine/*.py ui/*.py \
img/* lang/* dpkgfiles/* \
windowsbuild/* linuxbuild/* osxbuild/*

ACLOCAL_AMFLAGS = -I m4
ACLOCAL_AMFLAGS = -I build-aux/m4

lrelease:
if HAVE_GUI
Expand Down
Loading

0 comments on commit df920a7

Please sign in to comment.