kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zdump: Fix Makefile dependencies

Browse Source 
The Makefile target `check_dep_fuse` was declared as .PHONY and
therefore it was always rebuilt. This caused zgetdump to always be
relinked. While at it, remove the non-existent Makefile target
`check_dep_zlib` and add the cache files to `.gitignore`.

Closes: https://github.com/ibm-s390-linux/s390-tools/issues/144
Fixes: e537ab902e ("zdump: Makefile: add basic libpv support")
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
Reviewed-by: Steffen Eiden <seiden@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Marc Hartmayer
2022-11-25 16:22:35 +00:00
committed by Jan Höppner
parent 5bdabe3e06
commit 8d8d5e9746
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -95,6 +95,9 @@ zdev/src/chzdev_usage.c
zdev/src/lszdev zdev/src/lszdev
zdev/src/lszdev_usage.c zdev/src/lszdev_usage.c
zdsfs/zdsfs zdsfs/zdsfs
zdump/.check_dep_fuse
zdump/.check_dep_zgetdump
zdump/.detect_openssl.dep.c
zdump/zgetdump zdump/zgetdump
zfcpdump/10-zfcpdump.install zfcpdump/10-zfcpdump.install
zfcpdump/cpioinit zfcpdump/cpioinit

13
zdump/Makefile
View File

@@ -7,17 +7,18 @@ ALL_CFLAGS += -Wno-address-of-packed-member
# #
ifeq (${HAVE_FUSE},0) ifeq (${HAVE_FUSE},0)
check_dep_fuse: .check_dep_fuse:
touch $@
else else
check_dep_fuse: .check_dep_fuse:
$(call check_dep, \ $(call check_dep, \
"zgetdump mount support", \ "zgetdump mount support", \
"fuse.h", \ "fuse.h", \
"fuse3-devel or libfuse3-dev", \ "fuse3-devel or libfuse3-dev", \
"HAVE_FUSE=0", \ "HAVE_FUSE=0", \
"-DFUSE_USE_VERSION=30") "-DFUSE_USE_VERSION=30")
touch $@
endif endif
.detect_openssl.dep.c: .detect_openssl.dep.c:
@@ -30,7 +31,7 @@ endif
echo " EVP_MD_CTX_free(ctx);" >> $@ echo " EVP_MD_CTX_free(ctx);" >> $@
echo "}" >> $@ echo "}" >> $@
.check_dep_zgetdump: .detect_openssl.dep.c check_dep_fuse .check_dep_zgetdump: .detect_openssl.dep.c .check_dep_fuse
$(call check_dep, \ $(call check_dep, \
"zgetdump", \ "zgetdump", \
"zlib.h", \ "zlib.h", \
@@ -131,6 +132,6 @@ install-zgetdump: zgetdump
install: $(INSTALL_TARGETS) install: $(INSTALL_TARGETS)
clean: clean:
rm -f -- *.o *~ zgetdump core.* .detect_openssl.dep.c .check_dep_zgetdump rm -f -- *.o *~ zgetdump core.* .detect_openssl.dep.c .check_dep_zgetdump .check_dep_fuse
.PHONY: all install clean check_dep_fuse check_dep_zlib skip-zgetdump install-zgetdump .PHONY: all install clean skip-zgetdump install-zgetdump