From 8ff43c3705573043e2fa8ce68c2f052273cce205 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Tue, 8 Sep 2015 14:33:29 +0200 Subject: [PATCH] makefiles: ensure no old .h are left Ensure make clean cleans any left-over file from their previous location so they are not in conflict with new ones. Also hide error message when .commands file is not present. --- lib/Makefile.in | 2 ++ test/Makefile.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Makefile.in b/lib/Makefile.in index ec80c7c19..3e0e6f87e 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -229,3 +229,5 @@ include $(top_builddir)/make.tmpl CFLAGS += $(BLKID_CFLAGS) $(UDEV_CFLAGS) $(VALGRIND_CFLAGS) $(SUBDIRS): $(LIB_STATIC) + +CLEAN_TARGETS += misc/configure.h misc/lvm-version.h diff --git a/test/Makefile.in b/test/Makefile.in index e6860e12e..769f931b3 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -281,7 +281,7 @@ lib/paths: lib/paths-common echo 'abs_builddir="$(abs_builddir)"' >> $@-t mv $@-t $@ -CMDS = lvm $(shell cat $(top_builddir)/tools/.commands) +CMDS = lvm $(shell cat $(top_builddir)/tools/.commands 2>/dev/null) LIB = $(addprefix lib/, $(LIB_SHARED) $(LIB_LOCAL) $(LIB_NOT) $(LIB_LINK_NOT) $(LIB_FLAVOURS)) .tests-stamp: $(ALL) $(LIB) $(SUBDIRS)