From c4ef2d1f039cf3de7d3cb54c6aa549af27bb3f1c Mon Sep 17 00:00:00 2001 From: Evan Klitzke Date: Tue, 8 Aug 2017 18:56:18 -0700 Subject: [PATCH] build: fix automake warnings when running autogen.sh - Removes hard coded GZIP_ENV because this is now handled properly by gitian. - Removes target '.mm.o' because that was needed for XCode <= 4.2 Cherry-picked from: f8c6697 --- Makefile.am | 1 - src/Makefile.am | 4 ---- 2 files changed, 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 82c6e8a77..08634b534 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,6 @@ SUBDIRS += doc/man endif .PHONY: deploy FORCE -GZIP_ENV="-9n" export PYTHONPATH if BUILD_BITCOIN_LIBS diff --git a/src/Makefile.am b/src/Makefile.am index 58c7a3968..bf2284005 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -498,10 +498,6 @@ clean-local: ## FIXME: How to get the appropriate modulename_CPPFLAGS in here? $(AM_V_GEN) $(WINDRES) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) -DWINDRES_PREPROC -i $< -o $@ -.mm.o: - $(AM_V_CXX) $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CXXFLAGS) $(QT_INCLUDES) $(AM_CXXFLAGS) $(PIE_FLAGS) $(CXXFLAGS) -c -o $@ $< - check-symbols: $(bin_PROGRAMS) if GLIBC_BACK_COMPAT @echo "Checking glibc back compat..."