From 49376579bfc873bf4b38f0aa7e1d0f5d05ab85d7 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Thu, 13 Jan 2011 14:58:59 +0000 Subject: [PATCH] Include default make.tmpl Use default clean targets for this Makefile Use also same build flags for compiling testing tools like harness. --- test/Makefile.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in index 8682e51ca..1d865a0f6 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -24,6 +24,7 @@ abs_srcdir = @abs_srcdir@ abs_builddir = @abs_builddir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +include $(top_builddir)/make.tmpl T ?= . S ?= @ # never match anything by default @@ -59,7 +60,7 @@ lib/should: lib/not ln -sf not lib/should lib/%: $(srcdir)/lib/%.c .lib-dir-stamp - $(CC) -o $@ $< + $(CC) $(DEFS) $(CFLAGS) -o $@ $< lib/%: $(srcdir)/lib/%.sh .lib-dir-stamp cp $< $@ @@ -100,13 +101,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status touch $@ clean: - rm -rf bin .lib-dir-stamp .test-stamp - rm -f $(LIB) - rm -f lib/dmsetup lib/clvmd lib/dmeventd for i in lvm $$(cat ../tools/.commands); do rm -f lib/$$i; done if test "$(srcdir)" != . ; then rm -f $(subst $(srcdir)/, ,$(RUN)) lvm2app.sh ; fi -distclean: clean - rm -f Makefile +CLEAN_TARGETS += .lib-dir-stamp .test-stamp -f $(LIB) lib/dmsetup lib/clvmd lib/dmeventd .NOTPARALLEL: -- 2.43.5