mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
make: cflow target works again
Restored 'make cflow' functinality. Produces some quick referece of function chaining and usage.
This commit is contained in:
parent
e86798203e
commit
3d26bde1c0
@ -22,6 +22,9 @@ SOURCES = clogd.c cluster.c compat.c functions.c link_mon.c local.c logging.c
|
||||
|
||||
TARGETS = cmirrord
|
||||
|
||||
CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
|
||||
CFLOW_TARGET := $(TARGETS)
|
||||
|
||||
include $(top_builddir)/make.tmpl
|
||||
|
||||
LMLIBS += $(CPG_LIBS)
|
||||
|
@ -14,11 +14,21 @@
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
top_builddir = @top_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
|
||||
SOURCES = libdevmapper-event.c
|
||||
SOURCES2 = dmeventd.c
|
||||
|
||||
TARGETS = dmeventd
|
||||
CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES) $(SOURCES2) \
|
||||
plugins/lvm2/dmeventd_lvm.c \
|
||||
plugins/mirror/dmeventd_mirror.c \
|
||||
plugins/raid/dmeventd_raid.c \
|
||||
plugins/snapshot/dmeventd_snapshot.c \
|
||||
plugins/thin/dmeventd_thin.c \
|
||||
plugins/vdo/dmeventd_vdo.c \
|
||||
)
|
||||
CFLOW_TARGET := $(TARGETS)
|
||||
|
||||
.PHONY: install_lib_dynamic install_lib_static install_include \
|
||||
install_pkgconfig install_dmeventd_dynamic install_dmeventd_static \
|
||||
@ -46,7 +56,6 @@ endif
|
||||
|
||||
CFLOW_LIST = $(SOURCES)
|
||||
CFLOW_LIST_TARGET = $(LIB_NAME).cflow
|
||||
CFLOW_TARGET = dmeventd
|
||||
|
||||
EXPORTED_HEADER = $(srcdir)/libdevmapper-event.h
|
||||
EXPORTED_FN_PREFIX = dm_event
|
||||
@ -73,14 +82,6 @@ ifeq ("@PKGCONFIG@", "yes")
|
||||
INSTALL_LIB_TARGETS += install_pkgconfig
|
||||
endif
|
||||
|
||||
ifneq ("$(CFLOW_CMD)", "")
|
||||
CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
|
||||
-include $(top_builddir)/lib/liblvm-internal.cflow
|
||||
-include $(top_builddir)/lib/liblvm2cmd.cflow
|
||||
-include $(top_builddir)/daemons/dmeventd/$(LIB_NAME).cflow
|
||||
-include $(top_builddir)/daemons/dmeventd/plugins/mirror/$(LIB_NAME)-lvm2mirror.cflow
|
||||
endif
|
||||
|
||||
install_include: $(srcdir)/libdevmapper-event.h
|
||||
@echo " [INSTALL] $(<F)"
|
||||
$(Q) $(INSTALL_DATA) -D $< $(includedir)/$(<F)
|
||||
|
@ -25,9 +25,6 @@ LIB_NAME = libdevmapper-event-lvm2mirror
|
||||
LIB_SHARED = $(LIB_NAME).$(LIB_SUFFIX)
|
||||
LIB_VERSION = $(LIB_VERSION_LVM)
|
||||
|
||||
CFLOW_LIST = $(SOURCES)
|
||||
CFLOW_LIST_TARGET = $(LIB_NAME).cflow
|
||||
|
||||
include $(top_builddir)/make.tmpl
|
||||
|
||||
install_lvm2: install_dm_plugin
|
||||
|
@ -24,9 +24,6 @@ LIB_NAME = libdevmapper-event-lvm2raid
|
||||
LIB_SHARED = $(LIB_NAME).$(LIB_SUFFIX)
|
||||
LIB_VERSION = $(LIB_VERSION_LVM)
|
||||
|
||||
CFLOW_LIST = $(SOURCES)
|
||||
CFLOW_LIST_TARGET = $(LIB_NAME).cflow
|
||||
|
||||
include $(top_builddir)/make.tmpl
|
||||
|
||||
install_lvm2: install_dm_plugin
|
||||
|
@ -24,9 +24,6 @@ LIB_NAME = libdevmapper-event-lvm2thin
|
||||
LIB_SHARED = $(LIB_NAME).$(LIB_SUFFIX)
|
||||
LIB_VERSION = $(LIB_VERSION_LVM)
|
||||
|
||||
CFLOW_LIST = $(SOURCES)
|
||||
CFLOW_LIST_TARGET = $(LIB_NAME).cflow
|
||||
|
||||
include $(top_builddir)/make.tmpl
|
||||
|
||||
install_lvm2: install_dm_plugin
|
||||
|
@ -24,9 +24,6 @@ LIB_NAME = libdevmapper-event-lvm2vdo
|
||||
LIB_SHARED = $(LIB_NAME).$(LIB_SUFFIX)
|
||||
LIB_VERSION = $(LIB_VERSION_LVM)
|
||||
|
||||
CFLOW_LIST = $(SOURCES)
|
||||
CFLOW_LIST_TARGET = $(LIB_NAME).cflow
|
||||
|
||||
include $(top_builddir)/make.tmpl
|
||||
|
||||
install_lvm2: install_dm_plugin
|
||||
|
@ -34,6 +34,9 @@ SOURCES2 = lvmlockctl.c
|
||||
|
||||
TARGETS = lvmlockd lvmlockctl
|
||||
|
||||
CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
|
||||
CFLOW_TARGET = lvmlockd
|
||||
|
||||
.PHONY: install_lvmlockd
|
||||
|
||||
include $(top_builddir)/make.tmpl
|
||||
|
@ -19,11 +19,10 @@ SOURCES = lvmpolld-core.c lvmpolld-data-utils.c lvmpolld-cmd-utils.c
|
||||
|
||||
TARGETS = lvmpolld
|
||||
|
||||
.PHONY: install_lvmpolld
|
||||
CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
|
||||
CFLOW_TARGET := $(TARGETS)
|
||||
|
||||
CFLOW_LIST = $(SOURCES)
|
||||
CFLOW_LIST_TARGET = $(LIB_NAME).cflow
|
||||
CFLOW_TARGET = lvmpolld
|
||||
.PHONY: install_lvmpolld
|
||||
|
||||
include $(top_builddir)/make.tmpl
|
||||
|
||||
|
@ -15,6 +15,7 @@
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
top_builddir = @top_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
|
||||
SOURCES =\
|
||||
activate/activate.c \
|
||||
|
@ -15,6 +15,7 @@
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
top_builddir = @top_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
|
||||
SUBDIRS=dm-tools
|
||||
|
||||
|
@ -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")
|
||||
|
@ -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)
|
||||
|
14
make.tmpl.in
14
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)
|
||||
|
@ -109,9 +109,9 @@ endif
|
||||
EXPORTED_HEADER = $(srcdir)/lvm2cmd.h
|
||||
EXPORTED_FN_PREFIX = lvm2
|
||||
|
||||
CFLOW_LIST = lvmcmdlib.c lvm2cmd.c
|
||||
CFLOW_LIST_TARGET = liblvm2cmd.cflow
|
||||
CFLOW_TARGET = lvm
|
||||
CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES) lvmcmdlib.c lvm2cmd.c)
|
||||
-include $(top_builddir)/lib/liblvm-internal.cflow
|
||||
|
||||
include $(top_builddir)/make.tmpl
|
||||
|
||||
@ -198,11 +198,7 @@ command-lines-input.h: $(srcdir)/command-lines.in Makefile
|
||||
|
||||
$(SOURCES:%.c=%.d) $(SOURCES2:%.c=%.d): command-lines-input.h command-count.h cmds.h
|
||||
$(SOURCES:%.c=%.o) $(SOURCES2:%.c=%.o): command-lines-input.h command-count.h cmds.h
|
||||
|
||||
ifneq ("$(CFLOW_CMD)", "")
|
||||
CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
|
||||
-include $(top_builddir)/lib/liblvm-internal.cflow
|
||||
endif
|
||||
lvm.cflow lvm.xref lvm.tree lvm.xref: command-lines-input.h command-count.h cmds.h
|
||||
|
||||
.PHONY: install_cmdlib_dynamic install_cmdlib_static install_cmdlib_include \
|
||||
install_tools_dynamic install_tools_static
|
||||
|
Loading…
Reference in New Issue
Block a user