Sync with proposed Makefile changes

A PR has been created for some proposed Makefile changes. The changes have been included here in case it takes awhile for the changes to be pulled into dev. If nothing else, this PR can be backed out later, and the libbtc-related changes re-added.
goatpig · Feb 13, 2018 · 536a4e1 · 536a4e1
1 parent 49a15b0
commit 536a4e1
Show file tree

Hide file tree

Showing 19 changed files with 665 additions and 1,628 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -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