fix: resolve issues with dist builds

Author: kwvg

Makefile.am

@@ -65,6 +65,11 @@ WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/dash.ico \
 OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_INSTALLER_ICONS) \
   $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh
 
+CARGO_FILES = \
+  $(top_srcdir)/.cargo/config.toml.offline \
+  $(top_srcdir)/Cargo.lock \
+  $(top_srcdir)/Cargo.toml
+
 COVERAGE_INFO = $(COV_TOOL_WRAPPER) baseline.info \
   test_dash_filtered.info total_coverage.info \
   baseline_filtered.info functional_test.info functional_test_filtered.info \
@@ -249,7 +254,7 @@ endif
 
 dist_noinst_SCRIPTS = autogen.sh
 
-EXTRA_DIST = $(DIST_SHARE) $(DIST_CONTRIB) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
+EXTRA_DIST = $(DIST_SHARE) $(DIST_CONTRIB) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS) $(CARGO_FILES)
 
 EXTRA_DIST += \
     test/functional \

rust/Makefile.am

@@ -63,6 +63,9 @@ endif # ENABLE_ONLINE_RUST
 
 include $(top_srcdir)/rust/Makefile.libs.include
 
+EXTRA_DIST = \
+	$(LIBRUST_CHIRP_FILES)
+
 all-local: $(CARGO_CONFIGURED) cargo-build-chirp cxxbridge-chirp
 
 cargo-build: $(CARGO_CONFIGURED) cargo-build-chirp

rust/Makefile.chirp.include

@@ -9,6 +9,7 @@ LIBRUST_CHIRP = $(LIBRUST_CHIRP_TARGET_DIR)/$(RUST_TARGET)/$(CARGO_PROFILE)/libc
 LIBRUST_CHIRP_CARGO_ENV = $(CARGO_ENV) CARGO_TARGET_DIR="$(LIBRUST_CHIRP_TARGET_DIR)"
 LIBRUST_CHIRP_CRATE_DIR = $(top_srcdir)/rust/chirp
 LIBRUST_CHIRP_GEN_DIR = $(abs_top_builddir)/rust/chirp/gen
+LIBRUST_CHIRP_GEN_SRCDIR = $(top_srcdir)/rust/chirp/gen
 LIBRUST_CHIRP_MANIFEST = $(LIBRUST_CHIRP_CRATE_DIR)/Cargo.toml
 LIBRUST_CHIRP_CARGO_BUILD_OPTS = $(CARGO_BUILD_OPTS) --manifest-path $(LIBRUST_CHIRP_MANIFEST)
 
@@ -27,11 +28,28 @@ LIBRUST_CHIRP_H = \
 LIBRUST_CHIRP_INCLUDES = \
 	-I$(LIBRUST_CHIRP_GEN_DIR)/include
 
+LIBRUST_CHIRP_FILES = \
+	$(LIBRUST_CHIRP_BUILD) \
+	$(LIBRUST_CHIRP_MANIFEST) \
+	$(LIBRUST_CHIRP_SRCS)
+
 $(LIBRUST_CHIRP_SRCS): ;
 
-$(LIBRUST_CHIRP_H) $(LIBRUST_CHIRP_CPP): $(LIBRUST_CHIRP_SRCS)
+$(LIBRUST_CHIRP_CPP): $(LIBRUST_CHIRP_SRCS)
+	$(AM_V_at)$(MKDIR_P) $(@D)
+	$(AM_V_GEN)if test -f $(LIBRUST_CHIRP_GEN_SRCDIR)/src/lib.cpp; then \
+	  cp $(LIBRUST_CHIRP_GEN_SRCDIR)/src/lib.cpp $@; \
+	else \
+	  $(CXXBRIDGE) $< -o $@; \
+	fi
+
+$(LIBRUST_CHIRP_H): $(LIBRUST_CHIRP_SRCS)
 	$(AM_V_at)$(MKDIR_P) $(@D)
-	$(AM_V_GEN)$(CXXBRIDGE) $< $(if $(filter %.h,$@),--header) -o $@
+	$(AM_V_GEN)if test -f $(LIBRUST_CHIRP_GEN_SRCDIR)/include/rust/chirp/lib.h; then \
+	  cp $(LIBRUST_CHIRP_GEN_SRCDIR)/include/rust/chirp/lib.h $@; \
+	else \
+   	  $(CXXBRIDGE) $< --header -o $@; \
+	fi
 
 $(LIBRUST_CHIRP): $(LIBRUST_CHIRP_SRCS) $(LIBRUST_CHIRP_BUILD) $(LIBRUST_CHIRP_MANIFEST)
 	$(AM_V_GEN)$(LIBRUST_CHIRP_CARGO_ENV) $(CARGO) build $(LIBRUST_CHIRP_CARGO_BUILD_OPTS)
@@ -46,4 +64,10 @@ cxxbridge-clean-chirp:
 
 cxxbridge-chirp: $(LIBRUST_CHIRP_CPP) $(LIBRUST_CHIRP_H)
 
+dist-hook: cxxbridge-chirp
+	$(MKDIR_P) $(distdir)/chirp/gen/src
+	$(MKDIR_P) $(distdir)/chirp/gen/include/rust/chirp
+	cp $(LIBRUST_CHIRP_CPP) $(distdir)/chirp/gen/src/
+	cp $(LIBRUST_CHIRP_H) $(distdir)/chirp/gen/include/rust/chirp/
+
 .PHONY: cargo-build-chirp cargo-clean-chirp cxxbridge-chirp cxxbridge-clean-chirp

src/Makefile.am

@@ -1198,7 +1198,7 @@ endif
 libcxxbridge_la_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(PIC_FLAGS)
 libcxxbridge_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(PIC_FLAGS) -static
 libcxxbridge_la_LDFLAGS = $(AM_LDFLAGS) -static
-libcxxbridge_la_SOURCES = $(LIBRUSTDEPS_CPP)
+nodist_libcxxbridge_la_SOURCES = $(LIBRUSTDEPS_CPP)
 
 $(libcxxbridge_la_OBJECTS): $(LIBRUSTDEPS_H)
 #