Skip to content

Commit 637a170

Browse files
uli42sunweaver
authored andcommitted
silence imake for normal builds
You can reactivate previous chatty output by setting VERBOSE, e.g. make VERBOSE=1 or VERBOSE=1 make
1 parent fb0f8c1 commit 637a170

File tree

7 files changed

+104
-74
lines changed

7 files changed

+104
-74
lines changed

.github/workflows/nx-libs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,6 @@ jobs:
211211
case "${{ matrix.cfg.container }}" in
212212
fedora*|*/centos*|debian*|ubuntu*)
213213
export IMAKE_DEFINES="-DUseTIRPC=YES"
214-
make IMAKE_DEFINES="${IMAKE_DEFINES}"
214+
make VERBOSE=1 IMAKE_DEFINES="${IMAKE_DEFINES}"
215215
;;
216216
esac

Makefile

+31-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
NULL =
44

5+
# suppress most make output unless "make VERBOSE=1" has been called
6+
ifndef VERBOSE
7+
.SILENT:
8+
endif
9+
510
# helpers for "install" target
611
INSTALL_DIR=install -d -m 755
712
INSTALL_FILE=install -m 644
@@ -69,14 +74,19 @@ NX_XTRANS_HEADERS = \
6974
all: build
7075

7176
clean: version imakeconfig
77+
@echo
78+
@echo "===> $@"
7279
test -f nxcomp/Makefile && ${MAKE} -C nxcomp clean || true
7380
test -f nxproxy/Makefile && ${MAKE} -C nxproxy clean || true
7481
test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib clean || true
7582
test -f nxcompshad/Makefile && ${MAKE} -C nxcompshad clean || true
7683
test -d nx-X11 && ${MAKE} clean-env || true
7784
test -f nxdialog/Makefile && ${MAKE} -C nxdialog clean || true
85+
@echo "<=== $@"
7886

7987
distclean: clean version imakeconfig
88+
@echo
89+
@echo "===> $@"
8090
test -f nxcomp/Makefile && ${MAKE} -C nxcomp distclean || true
8191
test -f nxproxy/Makefile && ${MAKE} -C nxproxy distclean || true
8292
test -f nx-X11/lib/Makefile && ${MAKE} -C nx-X11/lib distclean || true
@@ -87,9 +97,10 @@ distclean: clean version imakeconfig
8797
$(RM_DIR_REC) nx-X11/extras/Mesa/.pc/
8898
$(RM_FILE) nx-X11/config/cf/nxversion.def
8999
$(RM_FILE) nx-X11/config/cf/nxconfig.def
100+
@echo "<=== $@"
90101

91102
test:
92-
echo "No testing for NX (redistributed)"
103+
@echo "No testing for NX (redistributed)"
93104

94105
version:
95106
# prepare nx-X11/config/cf/nxversion.def
@@ -105,6 +116,8 @@ ifneq "$(strip $(NX_VERSION_CUSTOM))" ""
105116
endif
106117

107118
imakeconfig:
119+
@echo;
120+
@echo "===> $@"
108121
# auto-config some setting
109122

110123
# check if system supports Xfont2
@@ -126,8 +139,11 @@ imakeconfig:
126139

127140
# let's create the nx-X11 Makefiles now, once everything has been defined
128141
$(MAKE) -j1 -C nx-X11 Makefiles IMAKE_DEFINES="$(IMAKE_DEFINES)"
142+
@echo "<=== $@"
129143

130144
build-env: version imakeconfig
145+
@echo
146+
@echo "===> $@"
131147
# prepare Makefiles and the nx-X11 symlinking magic
132148
${MAKE} -j1 -C nx-X11 BuildIncludes IMAKE_DEFINES="$(IMAKE_DEFINES)"
133149

@@ -142,8 +158,11 @@ build-env: version imakeconfig
142158
for header in $(NX_XTRANS_HEADERS); do \
143159
${SYMLINK_FILE} ../../../../lib/include/xtrans/$${header} nx-X11/exports/include/nx-X11/Xtrans/$${header}; \
144160
done
161+
@echo "<=== $@"
145162

146163
clean-env: version
164+
@echo
165+
@echo "===> $@"
147166
for header in $(NX_X11_HEADERS); do \
148167
${RM_FILE} nx-X11/exports/include/nx-X11/$${header}; \
149168
done
@@ -155,14 +174,21 @@ clean-env: version
155174
[ -d exports/include/nx-X11/ ] && $(RM_DIR) exports/include/nx-X11/ || :
156175

157176
${MAKE} -j1 -C nx-X11 clean IMAKE_DEFINES="$(IMAKE_DEFINES)"
177+
@echo "<=== $@"
158178

159179
build-lite:
180+
@echo
181+
@echo "===> $@"
160182
cd nxcomp && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
161183
cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
184+
@echo "<=== $@"
162185

163186
build-full: build-env
164187
# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
165188

189+
@echo
190+
@echo "===> $@"
191+
166192
# build nxcomp first
167193
cd nxcomp && autoreconf -vfsi && (${CONFIGURE} $(CUSTOM_VERSION_DEFINE)) && ${MAKE}
168194

@@ -186,13 +212,17 @@ build-full: build-env
186212

187213
# "build" nxdialog last
188214
cd nxdialog && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
215+
@echo "<=== $@"
189216

190217
build:
218+
@echo
219+
@echo "===> $@"
191220
if ! test -d nx-X11; then \
192221
${MAKE} build-lite; \
193222
else \
194223
${MAKE} build-full; \
195224
fi
225+
@echo "<=== $@"
196226

197227
install:
198228
$(MAKE) install-lite

debian/rules

+7-7
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ else
7171
endif
7272

7373
%:
74-
CONFIGURE="./configure --disable-silent-rules \
75-
--prefix=/usr \
76-
--libdir=$(LIBDIR) \
77-
--includedir=$(INCLUDEDIR) \
78-
--libexecdir=$(LIBEXECDIR) \
79-
--build=$(DEB_BUILD_GNU_TYPE) \
80-
--host=$(DEB_HOST_GNU_TYPE)" dh $@ --no-parallel --with quilt
74+
VERBOSE=1 CONFIGURE="./configure --disable-silent-rules \
75+
--prefix=/usr \
76+
--libdir=$(LIBDIR) \
77+
--includedir=$(INCLUDEDIR) \
78+
--libexecdir=$(LIBEXECDIR) \
79+
--build=$(DEB_BUILD_GNU_TYPE) \
80+
--host=$(DEB_HOST_GNU_TYPE)" dh $@ --no-parallel --with quilt
8181

8282
override_dh_auto_clean:
8383
rm -Rf nx-X11/.build-exports

0 commit comments

Comments
 (0)