From 3d26bde1c02b5b3cdfe6bbf87dcad8ce552b0bba Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Fri, 19 Mar 2021 23:10:55 +0100
Subject: make: cflow target works again

Restored 'make cflow' functinality.
Produces some quick referece of function chaining and usage.
---
 make.tmpl.in | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'make.tmpl.in')

diff --git a/make.tmpl.in b/make.tmpl.in
index 75bb4f243..d95d956fa 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -388,8 +388,7 @@ $(SUBDIRS.generate):
 ifneq ("$(CFLOW_LIST_TARGET)", "")
 CLEAN_CFLOW += $(CFLOW_LIST_TARGET)
 $(CFLOW_LIST_TARGET): $(CFLOW_LIST)
-	echo "CFLOW_SOURCES += $(addprefix \
-		\$$(top_srcdir)$(subst $(top_srcdir),,$(srcdir))/, $(CFLOW_LIST))" > $@
+	echo "CFLOW_SOURCES += $(addprefix $(abs_srcdir)/, $(CFLOW_LIST))" > $@
 cflow: $(CFLOW_LIST_TARGET)
 endif
 
@@ -403,21 +402,20 @@ CLEAN_CFLOW += \
 
 ifneq ("$(CFLOW_CMD)", "")
 CFLOW_FLAGS +=\
- --cpp="$(CC) -E" \
+ --cpp="$(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(BLKID_CFLAGS) $(DEFS)" \
  --symbol _ISbit:wrapper \
  --symbol __attribute__:wrapper \
- --symbol __const__:wrapper \
  --symbol __const:type \
- --symbol __restrict:type \
+ --symbol __const__:wrapper \
  --symbol __extension__:wrapper \
+ --symbol __leaf__:wrapper \
  --symbol __nonnull:wrapper \
  --symbol __nothrow__:wrapper \
  --symbol __pure__:wrapper \
  --symbol __REDIRECT:wrapper \
  --symbol __REDIRECT_NTH:wrapper \
- --symbol __wur:wrapper \
- -I$(top_srcdir)/daemons/dmeventd/plugins/lvm2/ \
- $(INCLUDES) $(DEFS)
+ --symbol __restrict:type \
+ --symbol __wur:wrapper
 
 $(CFLOW_TARGET).cflow: $(CFLOW_SOURCES)
 	$(CFLOW_CMD) -o$@ $(CFLOW_FLAGS) $(CFLOW_SOURCES)
-- 
cgit v1.2.1