fix: resolve make distdir errors

Author: kwvg

rust/Makefile.am

@@ -77,4 +77,10 @@ cargo-clean-config:
 
 clean-local: cargo-clean-chirp cxxbridge-clean-chirp clean-librustdeps-la cargo-clean-config
 
+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 cargo-clean cargo-clean-config

rust/Makefile.chirp.include

@@ -12,6 +12,8 @@ LIBRUST_CHIRP_GEN_DIR = $(abs_top_builddir)/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)
 
+LIBRUST_CHIRP_GEN_SRCDIR = $(top_srcdir)/rust/chirp/gen
+
 LIBRUST_CHIRP_SRCS = \
 	$(LIBRUST_CHIRP_CRATE_DIR)/src/lib.rs
 
@@ -29,9 +31,21 @@ LIBRUST_CHIRP_INCLUDES = \
 
 $(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)

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)
 #