Merge branch 'uli42-pr/silence_imake' into 3.6.x

Attributes GH PR #1038: #1038
ArcticaProject · Apr 28, 2023 · 70df716 · 70df716
2 parents fb0f8c1 + 637a170
commit 70df716
Show file tree

Hide file tree

Showing 7 changed files with 104 additions and 74 deletions.
diff --git a/.github/workflows/nx-libs.yml b/.github/workflows/nx-libs.yml
@@ -211,6 +211,6 @@ jobs:
         case "${{ matrix.cfg.container }}" in
           fedora*|*/centos*|debian*|ubuntu*)
             export IMAKE_DEFINES="-DUseTIRPC=YES"
-            make IMAKE_DEFINES="${IMAKE_DEFINES}"
+            make VERBOSE=1 IMAKE_DEFINES="${IMAKE_DEFINES}"
             ;;
         esac
diff --git a/Makefile b/Makefile
@@ -2,6 +2,11 @@
 
 NULL =
 
+# suppress most make output unless "make VERBOSE=1" has been called
+ifndef VERBOSE
+.SILENT:
+endif
+
 # helpers for "install" target
 INSTALL_DIR=install -d -m 755
 INSTALL_FILE=install -m 644
@@ -69,14 +74,19 @@ NX_XTRANS_HEADERS =		\
 all: build
 
 clean: version imakeconfig
+	@echo
+	@echo "===> $@"
 	test -f nxcomp/Makefile     && ${MAKE} -C nxcomp clean         || true
 	test -f nxproxy/Makefile    && ${MAKE} -C nxproxy clean        || true
 	test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib clean     || true
 	test -f nxcompshad/Makefile && ${MAKE} -C nxcompshad clean     || true
 	test -d nx-X11              && ${MAKE} clean-env               || true
 	test -f nxdialog/Makefile   && ${MAKE} -C nxdialog clean       || true
+	@echo "<=== $@"
 
 distclean: clean version imakeconfig
+	@echo
+	@echo "===> $@"
 	test -f nxcomp/Makefile     && ${MAKE} -C nxcomp distclean     || true
 	test -f nxproxy/Makefile    && ${MAKE} -C nxproxy distclean    || true
 	test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib distclean || true
@@ -87,9 +97,10 @@ distclean: clean version imakeconfig
 	$(RM_DIR_REC) nx-X11/extras/Mesa/.pc/
 	$(RM_FILE) nx-X11/config/cf/nxversion.def
 	$(RM_FILE) nx-X11/config/cf/nxconfig.def
+	@echo "<=== $@"
 
 test:
-	echo "No testing for NX (redistributed)"
+	@echo "No testing for NX (redistributed)"
 
 version:
 	# prepare nx-X11/config/cf/nxversion.def
@@ -105,6 +116,8 @@ ifneq "$(strip $(NX_VERSION_CUSTOM))" ""
 endif
 
 imakeconfig:
+	@echo;
+	@echo "===> $@"
 	# auto-config some setting
 
 	# check if system supports Xfont2
@@ -126,8 +139,11 @@ imakeconfig:
 
 	# let's create the nx-X11 Makefiles now, once everything has been defined
 	$(MAKE) -j1 -C nx-X11 Makefiles IMAKE_DEFINES="$(IMAKE_DEFINES)"
+	@echo "<=== $@"
 
 build-env: version imakeconfig
+	@echo
+	@echo "===> $@"
 	# prepare Makefiles and the nx-X11 symlinking magic
 	${MAKE} -j1 -C nx-X11 BuildIncludes IMAKE_DEFINES="$(IMAKE_DEFINES)"
 
@@ -142,8 +158,11 @@ build-env: version imakeconfig
 	for header in $(NX_XTRANS_HEADERS); do \
 	    ${SYMLINK_FILE} ../../../../lib/include/xtrans/$${header} nx-X11/exports/include/nx-X11/Xtrans/$${header}; \
 	done
+	@echo "<=== $@"
 
 clean-env: version
+	@echo
+	@echo "===> $@"
 	for header in $(NX_X11_HEADERS); do \
 	    ${RM_FILE} nx-X11/exports/include/nx-X11/$${header}; \
 	done
@@ -155,14 +174,21 @@ clean-env: version
 	[ -d exports/include/nx-X11/ ]       && $(RM_DIR) exports/include/nx-X11/        || :
 
 	${MAKE} -j1 -C nx-X11 clean IMAKE_DEFINES="$(IMAKE_DEFINES)"
+	@echo "<=== $@"
 
 build-lite:
+	@echo
+	@echo "===> $@"
 	cd nxcomp  && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
 	cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
+	@echo "<=== $@"
 
 build-full: build-env
 # in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
 
+	@echo
+	@echo "===> $@"
+
 	# build nxcomp first
 	cd nxcomp && autoreconf -vfsi && (${CONFIGURE} $(CUSTOM_VERSION_DEFINE)) && ${MAKE}
 
@@ -186,13 +212,17 @@ build-full: build-env
 
 	# "build" nxdialog last
 	cd nxdialog && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
+	@echo "<=== $@"
 
 build:
+	@echo
+	@echo "===> $@"
 	if ! test -d nx-X11; then \
 	    ${MAKE} build-lite; \
 	else \
 	    ${MAKE} build-full; \
 	fi
+	@echo "<=== $@"
 
 install:
 	$(MAKE) install-lite

diff --git a/debian/rules b/debian/rules
@@ -71,13 +71,13 @@ else
 endif
 
 %:
-	CONFIGURE="./configure --disable-silent-rules \
-	                       --prefix=/usr \
-	                       --libdir=$(LIBDIR) \
-	                       --includedir=$(INCLUDEDIR) \
-	                       --libexecdir=$(LIBEXECDIR) \
-	                       --build=$(DEB_BUILD_GNU_TYPE) \
-	                       --host=$(DEB_HOST_GNU_TYPE)"  dh $@ --no-parallel --with quilt
+	VERBOSE=1 CONFIGURE="./configure --disable-silent-rules \
+	                                 --prefix=/usr \
+	                                 --libdir=$(LIBDIR) \
+	                                 --includedir=$(INCLUDEDIR) \
+	                                 --libexecdir=$(LIBEXECDIR) \
+	                                 --build=$(DEB_BUILD_GNU_TYPE) \
+	                                 --host=$(DEB_HOST_GNU_TYPE)"  dh $@ --no-parallel --with quilt
 
 override_dh_auto_clean:
 	rm -Rf nx-X11/.build-exports