[Crash-utility] [PATCH 1/4] make: set --no-print-directory once
HAGIO KAZUHITO(萩尾 一仁)
k-hagio-ab at nec.com
Mon Dec 20 07:22:57 UTC 2021
-----Original Message-----
> add --no-print-directory to MAKEFLAGS right in the beginning
> to avoid repeating it in all make calls.
>
> Signed-off-by: Sven Schnelle <svens at linux.ibm.com>
Are these --no-print-directory missed or any reason?
all: make_configure
@./configure ${CONF_TARGET_FLAG} -p "RPMPKG=${RPMPKG}" -b
@$(MAKE) --no-print-directory gdb_merge
# @$(MAKE) --no-print-directory extensions
Thanks,
Kazu
> ---
> Makefile | 53 +++++++++++++++++++++++++++--------------------------
> 1 file changed, 27 insertions(+), 26 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 4fd8b7818664..0fe0f4a948cf 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -17,6 +17,7 @@
> # GNU General Public License for more details.
> #
>
> +MAKEFLAGS += --no-print-directory
> PROGRAM=crash
>
> #
> @@ -232,15 +233,15 @@ all: make_configure
>
> gdb_merge: force
> @if [ ! -f ${GDB}/README ]; then \
> - make --no-print-directory gdb_unzip; fi
> + make gdb_unzip; fi
> @echo "${LDFLAGS} -lz -ldl -rdynamic" > ${GDB}/gdb/mergelibs
> @echo "../../${PROGRAM} ../../${PROGRAM}lib.a" > ${GDB}/gdb/mergeobj
> @rm -f ${PROGRAM}
> @if [ ! -f ${GDB}/config.status ]; then \
> (cd ${GDB}; ./configure ${GDB_CONF_FLAGS} --with-separate-debug-dir=/usr/lib/debug \
> --with-bugurl="" --with-expat=no --with-python=no --disable-sim; \
> - make --no-print-directory CRASH_TARGET=${TARGET}; echo ${TARGET} > crash.target) \
> - else make --no-print-directory rebuild; fi
> + make CRASH_TARGET=${TARGET}; echo ${TARGET} > crash.target) \
> + else make rebuild; fi
> @if [ ! -f ${PROGRAM} ]; then \
> echo; echo "${PROGRAM} build failed"; \
> echo; exit 1; fi
> @@ -251,8 +252,8 @@ rebuild:
> @if [ -f ${GDB}.patch ] && [ -s ${GDB}.patch ] && \
> [ "`sum ${GDB}.patch`" != "`sum ${GDB}/${GDB}.patch`" ]; then \
> (sh -x ${GDB}.patch ${TARGET}; patch -N -p0 -r- --fuzz=0 < ${GDB}.patch; cp ${GDB}.patch ${GDB};
> cd ${GDB}; \
> - make --no-print-directory CRASH_TARGET=${TARGET}) \
> - else (cd ${GDB}/gdb; make --no-print-directory CRASH_TARGET=${TARGET}); fi
> + make CRASH_TARGET=${TARGET}) \
> + else (cd ${GDB}/gdb; make CRASH_TARGET=${TARGET}); fi
>
> gdb_unzip:
> @rm -f gdb.files
> @@ -264,7 +265,7 @@ gdb_unzip:
> [ ! -t 2 ] && WGET_OPTS="--progress=dot:mega"; \
> wget $$WGET_OPTS http://ftp.gnu.org/gnu/gdb/${GDB}.tar.gz; fi
> @tar --exclude-from gdb.files -xzmf ${GDB}.tar.gz
> - @make --no-print-directory gdb_patch
> + @make gdb_patch
>
> gdb_patch:
> if [ -f ${GDB}.patch ] && [ -s ${GDB}.patch ]; then \
> @@ -275,7 +276,7 @@ library: make_build_data ${OBJECT_FILES}
>
> gdb: force
> rm -f ${GDB_OFILES}
> - @make --no-print-directory all
> + @make all
>
> force:
>
> @@ -286,12 +287,12 @@ make_configure: force
>
> clean: make_configure
> @./configure ${CONF_TARGET_FLAG} -q -b
> - @make --no-print-directory do_clean
> + @make do_clean
>
> do_clean:
> rm -f ${OBJECT_FILES} ${DAEMON_OBJECT_FILES} ${PROGRAM} ${PROGRAM}lib.a ${GDB_OFILES}
> - @(cd extensions; make --no-print-directory -i clean)
> - @(cd memory_driver; make --no-print-directory -i clean)
> + @(cd extensions; make -i clean)
> + @(cd memory_driver; make -i clean)
>
> make_build_data: force
> ${CC} -c ${CRASH_CFLAGS} build_data.c ${WARNING_OPTIONS} ${WARNING_ERROR}
> @@ -306,31 +307,31 @@ unconfig: make_configure
>
> warn: make_configure
> @./configure ${CONF_TARGET_FLAG} -w -b
> - @make --no-print-directory gdb_merge
> + @make gdb_merge
>
> Warn: make_configure
> @./configure ${CONF_TARGET_FLAG} -W -b
> - @make --no-print-directory gdb_merge
> + @make gdb_merge
>
> nowarn: make_configure
> @./configure ${CONF_TARGET_FLAG} -n -b
> - @make --no-print-directory gdb_merge
> + @make gdb_merge
>
> lzo: make_configure
> @./configure -x lzo ${CONF_TARGET_FLAG} -w -b
> - @make --no-print-directory gdb_merge
> + @make gdb_merge
>
> snappy: make_configure
> @./configure -x snappy ${CONF_TARGET_FLAG} -w -b
> - @make --no-print-directory gdb_merge
> + @make gdb_merge
>
> zstd: make_configure
> @./configure -x zstd ${CONF_TARGET_FLAG} -w -b
> - @make --no-print-directory gdb_merge
> + @make gdb_merge
>
> valgrind: make_configure
> @./configure -x valgrind ${CONF_TARGET_FLAG} -w -b
> - @make --no-print-directory gdb_merge
> + @make gdb_merge
>
> main.o: ${GENERIC_HFILES} main.c
> ${CC} -c ${CRASH_CFLAGS} main.c ${WARNING_OPTIONS} ${WARNING_ERROR}
> @@ -536,7 +537,7 @@ bpf.o: ${GENERIC_HFILES} bpf.c
> ${CC} -c ${CRASH_CFLAGS} bpf.c ${WARNING_OPTIONS} ${WARNING_ERROR}
>
> ${PROGRAM}: force
> - @make --no-print-directory all
> + @make all
>
> # Remote daemon functionality has been deprecated.
> daemon_deprecated: force
> @@ -545,15 +546,15 @@ daemon_deprecated: force
>
> ${PROGRAM}d: daemon_deprecated make_configure
> @./configure -d
> - @make --no-print-directory make_build_data
> - @make --no-print-directory daemon
> + @make make_build_data
> + @make daemon
>
> daemon: ${DAEMON_OBJECT_FILES}
> ${CC} ${LDFLAGS} -o ${PROGRAM}d ${DAEMON_OBJECT_FILES} build_data.o -lz
>
> files: make_configure
> @./configure -q -b
> - @make --no-print-directory show_files
> + @make show_files
>
> gdb_files: make_configure
> @./configure -q -b
> @@ -570,7 +571,7 @@ ctags:
>
> tar: make_configure
> @./configure -q -b
> - @make --no-print-directory do_tar
> + @make do_tar
>
> do_tar:
> @if [ -f ${PROGRAM} ]; then \
> @@ -585,7 +586,7 @@ release: make_configure
> @if [ "`id --user`" != "0" ]; then \
> echo "make release: must be super-user"; exit 1; fi
> @./configure -P "RPMPKG=${RPMPKG}" -u -g
> - @make --no-print-directory release_configure
> + @make release_configure
> @echo
> @echo "cvs tag this release if necessary"
>
> @@ -593,7 +594,7 @@ release_configure: make_configure
> @if [ "${GDB}" = "" ] ; then \
> echo "make release: GDB not defined: append GDB=gdb-x.x to make command line"; echo; exit
> 1; fi
> @./configure -r ${GDB}
> - @make --no-print-directory do_release
> + @make do_release
>
> do_release:
> @echo "CRASH VERSION: ${VERSION} GDB VERSION: ${GDB}"
> @@ -657,10 +658,10 @@ dis:
>
> extensions: make_configure
> @./configure ${CONF_TARGET_FLAG} -q -b
> - @make --no-print-directory do_extensions
> + @make do_extensions
>
> do_extensions:
> @(cd extensions; make -i TARGET=$(TARGET) TARGET_CFLAGS="$(TARGET_CFLAGS)" GDB=$(GDB)
> GDB_FLAGS=$(GDB_FLAGS))
>
> memory_driver: make_configure
> - @(cd memory_driver; make --no-print-directory -i)
> + @(cd memory_driver; make -i)
> --
> 2.32.0
>
> --
> Crash-utility mailing list
> Crash-utility at redhat.com
> https://listman.redhat.com/mailman/listinfo/crash-utility
More information about the Crash-utility
mailing list