From 4966b7a22165aaaced5552433a963703c1a83770 Mon Sep 17 00:00:00 2001 From: Evan Klitzke Date: Tue, 8 Aug 2017 18:56:18 -0700 Subject: [PATCH] Fix automake warnings when running autogen.sh (cherry picked from commit f8c66972ddc2a70f5015497436870e2af6833ecc) --- Makefile.am | 2 -- src/Makefile.am | 4 ---- 2 files changed, 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index f9b60c8df..a5fa7513f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,8 +15,6 @@ SUBDIRS += doc/man endif .PHONY: deploy FORCE rpc-tests -GZIP_ENV="-9n" - if BUILD_BITCOIN_LIBS pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libzcash_script.pc diff --git a/src/Makefile.am b/src/Makefile.am index 0e21d2d44..1c4f47074 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -740,10 +740,6 @@ clean-local: @test -f $(WINDRES) $(AM_V_GEN) $(WINDRES) -DWINDRES_PREPROC -i $< -o $@ -.mm.o: - $(AM_V_CXX) $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CXXFLAGS) $(AM_CXXFLAGS) $(PIE_FLAGS) $(CXXFLAGS) -c -o $@ $< - check-symbols: $(bin_PROGRAMS) $(bin_SCRIPTS) if GLIBC_BACK_COMPAT @echo "Checking glibc back compat of [$(bin_PROGRAMS) $(bin_SCRIPTS)]..."