From b913ab5403a6a9088c38f4be5dc0aca9a7b8e766 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Fri, 3 Nov 2023 22:48:03 +0900 Subject: [PATCH] fixed some build dependency --- Makefile.am | 4 ++-- Makefile.in | 4 ++-- main.go | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index d325e29..957c15b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,9 +40,9 @@ hclgo_SOURCES = \ hclgo_DEPENDENCIES = hclgo.bin ## let the linker to move hclgo.bin to the actual target -hclgo_LINK = mv -f hclgo.bin hclgo$(EXEEXT) || echo "FAILED TO LINK" +hclgo_LINK = cp -pf hclgo.bin hclgo$(EXEEXT) || echo "FAILED TO LINK" -hclgo.bin: lib/libhcl.la +hclgo.bin: lib/libhcl.la $(hclgo_OBJECTS) cp -pf $(srcdir)/go.mod $(builddir)/go.mod >/dev/null 2>&1 || true chmod u+w $(builddir)/go.mod ## with `make distcheck`, the echo's redirection to the file fails without this permission change sed -r -i -e "/^[[:space:]]*replace[[:space:]]+cfg[[:space:]]*=>/d" $(builddir)/go.mod diff --git a/Makefile.in b/Makefile.in index fc1fea1..dde2047 100644 --- a/Makefile.in +++ b/Makefile.in @@ -372,7 +372,7 @@ DIST_SUBDIRS = $(SUBDIRS) @ENABLE_HCLGO_TRUE@ go.mod @ENABLE_HCLGO_TRUE@hclgo_DEPENDENCIES = hclgo.bin -@ENABLE_HCLGO_TRUE@hclgo_LINK = mv -f hclgo.bin hclgo$(EXEEXT) || echo "FAILED TO LINK" +@ENABLE_HCLGO_TRUE@hclgo_LINK = cp -pf hclgo.bin hclgo$(EXEEXT) || echo "FAILED TO LINK" all: all-recursive .SUFFIXES: @@ -937,7 +937,7 @@ distclean-local: clean-local: rm -rf $(builddir)/go.mod $(builddir)/go.sum -@ENABLE_HCLGO_TRUE@hclgo.bin: lib/libhcl.la +@ENABLE_HCLGO_TRUE@hclgo.bin: lib/libhcl.la $(hclgo_OBJECTS) @ENABLE_HCLGO_TRUE@ cp -pf $(srcdir)/go.mod $(builddir)/go.mod >/dev/null 2>&1 || true @ENABLE_HCLGO_TRUE@ chmod u+w $(builddir)/go.mod ## with `make distcheck`, the echo's redirection to the file fails without this permission change @ENABLE_HCLGO_TRUE@ sed -r -i -e "/^[[:space:]]*replace[[:space:]]+cfg[[:space:]]*=>/d" $(builddir)/go.mod diff --git a/main.go b/main.go index 247f823..9ae0d5d 100644 --- a/main.go +++ b/main.go @@ -125,7 +125,6 @@ func main() { } x.Close() - os.Exit(0) oops: