From 1f4352c15cc9c2d97bc4f62f94294ad5d8c4bf9b Mon Sep 17 00:00:00 2001 From: Patrick Kelsey Date: Tue, 19 Mar 2024 19:16:57 -0400 Subject: [PATCH 1/2] Provide a way to suppress the doc build when doing a make / make all A variable EXTRA_BUILD is defined, with a default value of 'doc', that establishes additional dependencies of the 'all' make target. This allows disabling the doc build during make / make all by passing 'EXTRA_BUILD=' on the configure command line. This relies on the fix for name=value command line arg processing. --- Makefile.in | 2 +- configure | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index af44687c..86b62fed 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,7 +13,7 @@ LDNAME=@LDNAME@ LDNAME_VERSION=@LDNAME_VERSION@ LDNAME_MAJOR=@LDNAME_MAJOR@ -all: doc +all: @EXTRA_BUILD@ $(MAKE) -C src all || exit @echo @echo diff --git a/configure b/configure index 10448d31..41a55882 100755 --- a/configure +++ b/configure @@ -41,6 +41,7 @@ PREFIX=${PREFIX:-"/usr/local"} LDNAME="libck.so" LDNAME_VERSION="libck.so.$VERSION" LDNAME_MAJOR="libck.so.$VERSION_MAJOR" +EXTRA_BUILD='doc' OPTION_CHECKING=1 @@ -134,6 +135,7 @@ generate() -e "s#@LDNAME_VERSION@#$LDNAME_VERSION#g" \ -e "s#@PC_CFLAGS@#$PC_CFLAGS#g" \ -e "s#@GIT_SHA@#$GIT_SHA#g" \ + -e "s#@EXTRA_BUILD@#$EXTRA_BUILD#g" \ $1 > $2 } @@ -158,10 +160,10 @@ generate_stdout() echo " LDNAME_MAJOR = $LDNAME_MAJOR" echo " LDFLAGS = $LDFLAGS" echo " STATIC_LIB = $DISABLE_STATIC" + echo " EXTRA_BUILD = $EXTRA_BUILD" echo " GZIP = $GZIP" echo " CORES = $CORES" echo " POINTER_PACK = $POINTER_PACK_ENABLE" - echo " PPC32_LWSYNC = $PPC32_LWSYNC_ENABLE" echo " VMA_BITS = $VMA_BITS" echo " MEMORY_MODEL = $MM" echo " RTM = $RTM_ENABLE" From 9ccec532134927abd47d713bc9ae0e45781e1b21 Mon Sep 17 00:00:00 2001 From: Patrick Kelsey Date: Wed, 20 Mar 2024 18:10:00 -0400 Subject: [PATCH 2/2] Replace inadvertantly removed status line --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 41a55882..52513796 100755 --- a/configure +++ b/configure @@ -164,6 +164,7 @@ generate_stdout() echo " GZIP = $GZIP" echo " CORES = $CORES" echo " POINTER_PACK = $POINTER_PACK_ENABLE" + echo " PPC32_LWSYNC = $PPC32_LWSYNC_ENABLE" echo " VMA_BITS = $VMA_BITS" echo " MEMORY_MODEL = $MM" echo " RTM = $RTM_ENABLE"