From c0a47bd3a22fccf9fcafd78394324df65c98be9d Mon Sep 17 00:00:00 2001 From: Dakoda Greaves Date: Tue, 19 Mar 2024 15:08:49 -0700 Subject: [PATCH] build: require secp256k1 build first in Makefile -this clears up an issue where when running make libsecp256k1.la was missing when libtool required it -removes redundant clean-local command that was consistently ignored --- Makefile.am | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index ac92c2d87..521f80606 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,11 +4,16 @@ AUTOMAKE_OPTIONS = serial-tests .INTERMEDIATE: $(GENBIN) DIST_SUBDIRS = src/secp256k1 - LIBSECP256K1=src/secp256k1/libsecp256k1.la - $(LIBSECP256K1): $(wildcard src/secp256k1/src/*) $(wildcard src/secp256k1/include/*) $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +SUBDIRS = $(DIST_SUBDIRS) +.PHONY: subdirs $(SUBDIRS) +subdirs: $(SUBDIRS) +$(SUBDIRS): + $(MAKE) -C $@ + +libdogecoin: src/secp256k1 includedir = $(prefix)/include/dogecoin @@ -264,6 +269,3 @@ endif endif libdogecoin_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_CURRENT):$(LIB_VERSION_REVISION):$(LIB_VERSION_AGE) - -clean-local: - -$(MAKE) -C src/secp256k1 clean