]> sourceware.org Git - lvm2.git/commitdiff
Include default make.tmpl
authorZdenek Kabelac <zkabelac@redhat.com>
Thu, 13 Jan 2011 14:58:59 +0000 (14:58 +0000)
committerZdenek Kabelac <zkabelac@redhat.com>
Thu, 13 Jan 2011 14:58:59 +0000 (14:58 +0000)
Use default clean targets for this Makefile
Use also same build flags for compiling testing tools like harness.

test/Makefile.in

index 8682e51ca0eb567b01c84ec3a2d81e80918c2752..1d865a0f643b5c7daa73cad31bbe539823c3599f 100644 (file)
@@ -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:
This page took 0.039347 seconds and 5 git commands to generate.