From d388f94c7fcd670310659f6a591fd02c0926d8e0 Mon Sep 17 00:00:00 2001 From: zkabelac <zkabelac> Date: Thu, 4 Mar 2010 09:53:08 +0000 Subject: [PATCH] Replace CFLOW_CMD only in make.tmpl and use it as variable elsewhere. --- WHATS_NEW | 1 + make.tmpl.in | 1 + tools/Makefile.in | 12 ++++++------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 58cde111f..a8094578d 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.62 - ==================================== + Replace CFLOW_CMD only in make.tmpl and use it as variable elsewhere. Use $(top_builddir) for inclusion of make.tmpl in Makefiles. Fix autoconf warning about ignored datarootdir. Increase AC_PREREQ version to 2.61 (for AC_PROC_SED, AC_PROG_MKDIR_P). diff --git a/make.tmpl.in b/make.tmpl.in index 61365ec04..5b8476f79 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -27,6 +27,7 @@ LCOV = @LCOV@ GENHTML = @GENHTML@ LN_S = @LN_S@ SED = @SED@ +CFLOW_CMD = @CFLOW_CMD@ LIBS = @LIBS@ DEFS += @DEFS@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 880ea8901..41c20dbad 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -147,20 +147,20 @@ liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS) .PHONY: install_cmdlib_dynamic install_cmdlib_static \ install_tools_dynamic install_tools_static -ifneq ("@CFLOW_CMD@", "") +ifneq ("$(CFLOW_CMD)", "") CFLOW_FLAGS += --cpp="$(CC) -E" .PHONY: lvm.cflow -include $(top_srcdir)/lib/liblvm-internal.cflow lvm.cflow: $(SOURCES) - @CFLOW_CMD@ -o$@ $(CFLOW_FLAGS) $(INCLUDES) $(DEFS) $(SOURCES) + $(CFLOW_CMD) -o$@ $(CFLOW_FLAGS) $(INCLUDES) $(DEFS) $(SOURCES) lvm.rxref: $(SOURCES) - @CFLOW_CMD@ -o$@ --cpp="$(CC) -E" -r --omit-arguments -x $(INCLUDES) $(DEFS) $(SOURCES) + $(CFLOW_CMD) -o$@ --cpp="$(CC) -E" -r --omit-arguments -x $(INCLUDES) $(DEFS) $(SOURCES) lvm.xref: $(SOURCES) - @CFLOW_CMD@ -o$@ --cpp="$(CC) -E" --omit-arguments -x $(INCLUDES) $(DEFS) $(SOURCES) + $(CFLOW_CMD) -o$@ --cpp="$(CC) -E" --omit-arguments -x $(INCLUDES) $(DEFS) $(SOURCES) lvm.rtree: $(SOURCES) - @CFLOW_CMD@ -o$@ --cpp="$(CC) -E" -r --omit-arguments -T -b $(INCLUDES) $(DEFS) $(SOURCES) + $(CFLOW_CMD) -o$@ --cpp="$(CC) -E" -r --omit-arguments -T -b $(INCLUDES) $(DEFS) $(SOURCES) lvm.tree: $(SOURCES) - @CFLOW_CMD@ -o$@ --cpp="$(CC) -E" --omit-arguments -T -b $(INCLUDES) $(DEFS) $(SOURCES) + $(CFLOW_CMD) -o$@ --cpp="$(CC) -E" --omit-arguments -T -b $(INCLUDES) $(DEFS) $(SOURCES) cflow: lvm.cflow lvm.xref lvm.tree lvm.rtree lvm.rxref endif