diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2021-03-19 23:10:55 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2021-03-20 00:05:01 +0100 |
| commit | 3d26bde1c02b5b3cdfe6bbf87dcad8ce552b0bba (patch) | |
| tree | aa94f8d068efe0aa18bc99fa4022dec94d758a91 /libdm | |
| parent | e86798203e4d2775aa418db6a17b908de7e15130 (diff) | |
| download | lvm2-3d26bde1c02b5b3cdfe6bbf87dcad8ce552b0bba.tar.gz | |
make: cflow target works again
Restored 'make cflow' functinality.
Produces some quick referece of function chaining and usage.
Diffstat (limited to 'libdm')
| -rw-r--r-- | libdm/Makefile.in | 1 | ||||
| -rw-r--r-- | libdm/dm-tools/Makefile.in | 5 | ||||
| -rw-r--r-- | libdm/make.tmpl.in | 18 |
3 files changed, 14 insertions, 10 deletions
diff --git a/libdm/Makefile.in b/libdm/Makefile.in index e9bb5ae2f..12fec06b4 100644 --- a/libdm/Makefile.in +++ b/libdm/Makefile.in @@ -15,6 +15,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ +abs_srcdir = @abs_srcdir@ SUBDIRS=dm-tools diff --git a/libdm/dm-tools/Makefile.in b/libdm/dm-tools/Makefile.in index 0b2ef9605..8fbdfc152 100644 --- a/libdm/dm-tools/Makefile.in +++ b/libdm/dm-tools/Makefile.in @@ -20,6 +20,11 @@ all: device-mapper SOURCES2 = dmsetup.c TARGETS_DM = dmsetup + +CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES2)) +CFLOW_TARGET := $(TARGETS_DM) +-include $(top_builddir)/libdm/libdevmapper.cflow + install_device-mapper: install_dmsetup_dynamic ifeq ("@STATIC_LINK@", "yes") diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in index 549ef79d9..70edcf91d 100644 --- a/libdm/make.tmpl.in +++ b/libdm/make.tmpl.in @@ -347,8 +347,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 @@ -362,23 +361,22 @@ CLEAN_CFLOW += \ ifneq ("$(CFLOW_CMD)", "") CFLOW_FLAGS +=\ - --cpp="$(CC) -E" \ + --cpp="$(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(BLKID_CFLAGS) $(DEFS) \ + -I$(top_srcdir)/libdm/ioctl \ + -I$(top_srcdir)/libdm" \ --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)/libdm \ - -I$(top_srcdir)/libdm/ioctl \ - -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) |