From fa3cabc8afb9d6f9b56ed372a592fed722b7c621 Mon Sep 17 00:00:00 2001 From: Ingo Franzki Date: Thu, 25 Oct 2018 12:57:29 +0200 Subject: [PATCH] zkey: Makefile: Don't rebuild .o.d files on 'make install' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The .o.d make targets in common.mak do not expect that header files are generated by a make target. When a new header file is generated, the .o.d targets will be rebuilt on the next make invocation, because that new header file is then detected, and is then treated as a new dependency of all .o.d targets. Signed-off-by: Ingo Franzki Signed-off-by: Jan Höppner --- zkey/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/zkey/Makefile b/zkey/Makefile index bc7bc335..a44b14ba 100644 --- a/zkey/Makefile +++ b/zkey/Makefile @@ -24,12 +24,12 @@ endif libs = $(rootdir)/libutil/libutil.a -detect-libcryptsetup.h: - echo "#include " > detect-libcryptsetup.h - echo "#ifndef CRYPT_LUKS2" >> detect-libcryptsetup.h - echo " #error libcryptsetup version 2.0.3 is required" >> detect-libcryptsetup.h - echo "#endif" >> detect-libcryptsetup.h - echo "int i = CRYPT_SLOT_UNBOUND;" >> detect-libcryptsetup.h +detect-libcryptsetup.dep: + echo "#include " > detect-libcryptsetup.dep + echo "#ifndef CRYPT_LUKS2" >> detect-libcryptsetup.dep + echo " #error libcryptsetup version 2.0.3 is required" >> detect-libcryptsetup.dep + echo "#endif" >> detect-libcryptsetup.dep + echo "int i = CRYPT_SLOT_UNBOUND;" >> detect-libcryptsetup.dep check-dep-zkey: $(call check_dep, \ @@ -39,10 +39,10 @@ check-dep-zkey: "HAVE_OPENSSL=0") touch check-dep-zkey -check-dep-zkey-cryptsetup: detect-libcryptsetup.h +check-dep-zkey-cryptsetup: detect-libcryptsetup.dep $(call check_dep, \ "zkey-cryptsetup", \ - "detect-libcryptsetup.h", \ + "detect-libcryptsetup.dep", \ "cryptsetup-devel version 2.0.3", \ "HAVE_CRYPTSETUP2=0", \ "-I.") @@ -95,7 +95,7 @@ install-zkey-cryptsetup: install: all install-common $(INSTALL_TARGETS) clean: - rm -f *.o zkey zkey-cryptsetup detect-libcryptsetup.h \ + rm -f *.o zkey zkey-cryptsetup detect-libcryptsetup.dep \ check-dep-zkey check-dep-zkey-cryptsetup .PHONY: all install clean zkey-skip zkey-cryptsetup-skip-cryptsetup2 \