[v4,2/5] trace-cmd: Rename plugin_python to plugin_python_loader.
diff mbox series

Message ID 20191004133647.27759-3-tz.stoyanov@gmail.com
State Superseded
Headers show
Series
  • Remove redundant trace-cmd plugin handling logic
Related show

Commit Message

Tzvetomir Stoyanov (VMware) Oct. 4, 2019, 1:36 p.m. UTC
The plugin_python is renamed to plugin_python_loader, to make
the name more closer to the actual plugin role.

Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
 Makefile                                               | 10 +---------
 lib/traceevent/plugins/Makefile                        |  6 +++---
 .../{plugin_python.c => plugin_python_loader.c}        |  0
 3 files changed, 4 insertions(+), 12 deletions(-)
 rename lib/traceevent/plugins/{plugin_python.c => plugin_python_loader.c} (100%)

Patch
diff mbox series

diff --git a/Makefile b/Makefile
index f336f7a..e20eced 100644
--- a/Makefile
+++ b/Makefile
@@ -116,8 +116,7 @@  PYTHON_PKGCONFIG_VERS ?= $(PYTHON_VERS)
 
 # Can build python?
 ifeq ($(shell sh -c "pkg-config --cflags $(PYTHON_PKGCONFIG_VERS) > /dev/null 2>&1 && echo y"), y)
-	PYTHON_PLUGINS := plugin_python.so
-	BUILD_PYTHON := $(PYTHON) $(PYTHON_PLUGINS)
+	BUILD_PYTHON := $(PYTHON)
 	BUILD_PYTHON_WORKS := 1
 else
 	BUILD_PYTHON := report_nopythondev
@@ -125,7 +124,6 @@  else
 endif
 endif # NO_PYTHON
 
-export PYTHON_PLUGINS
 export BUILD_PYTHON_WORKS
 export NO_PYTHON
 
@@ -418,12 +416,6 @@  python: $(PYTHON)
 PHONY += python-gui
 python-gui: $(PYTHON_GUI)
 
-PHONY += python-plugin
-python-plugin: $(PYTHON_PLUGINS)
-
-plugin_python.so: force $(obj)/lib/traceevent/plugins/trace_python_dir
-	$(Q)$(MAKE) -C $(src)/lib/traceevent/plugins $(obj)/lib/traceevent/plugins/plugin_python.so
-
 dist:
 	git archive --format=tar --prefix=trace-cmd-$(TRACECMD_VERSION)/ HEAD \
 		> ../trace-cmd-$(TRACECMD_VERSION).tar
diff --git a/lib/traceevent/plugins/Makefile b/lib/traceevent/plugins/Makefile
index e0a7566..061d919 100644
--- a/lib/traceevent/plugins/Makefile
+++ b/lib/traceevent/plugins/Makefile
@@ -21,7 +21,7 @@  PLUGIN_OBJS := $(PLUGIN_OBJS:%.o=$(bdir)/%.o)
 PLUGIN_BUILD := $(PLUGIN_OBJS:$(bdir)/%.o=$(bdir)/%.so)
 PLUGINS := $(PLUGIN_BUILD)
 ifndef NO_PYTHON
-PLUGINS += $(bdir)/plugin_python.so
+PLUGINS += $(bdir)/plugin_python_loader.so
 endif
 DEPS := $(PLUGIN_OBJS:$(bdir)/%.o=$(bdir)/.%.d)
 
@@ -44,10 +44,10 @@  $(DEPS): $(bdir)/.%.d: %.c
 
 $(PLUGIN_OBJS): $(bdir)/%.o : $(bdir)/.%.d
 
-$(bdir)/plugin_python.o: $(bdir)/%.o : %.c $(bdir)/trace_python_dir
+$(bdir)/plugin_python_loader.o: $(bdir)/%.o : %.c $(bdir)/trace_python_dir
 	$(Q)$(do_compile_python_plugin_obj)
 
-$(bdir)/plugin_python.so: $(bdir)/%.so: $(bdir)/%.o
+$(bdir)/plugin_python_loader.so: $(bdir)/%.so: $(bdir)/%.o
 	$(Q)$(do_python_plugin_build)
 
 PLUGINS_INSTALL = $(subst .so,.install,$(PLUGINS))
diff --git a/lib/traceevent/plugins/plugin_python.c b/lib/traceevent/plugins/plugin_python_loader.c
similarity index 100%
rename from lib/traceevent/plugins/plugin_python.c
rename to lib/traceevent/plugins/plugin_python_loader.c