From patchwork Wed Jan 10 15:58:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vladislav Valtchev (VMware)" X-Patchwork-Id: 10758451 Return-Path: linux-trace-devel-owner@vger.kernel.org Received: from mail-wr0-f194.google.com ([209.85.128.194]:43214 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965652AbeAJP66 (ORCPT ); Wed, 10 Jan 2018 10:58:58 -0500 Received: by mail-wr0-f194.google.com with SMTP id s13so15413723wra.10 for ; Wed, 10 Jan 2018 07:58:57 -0800 (PST) From: "Vladislav Valtchev (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Vladislav Valtchev (VMware)" Subject: [PATCH 2/6] trace-cmd: Make the plugins buildable out-of-tree Date: Wed, 10 Jan 2018 17:58:28 +0200 Message-Id: <20180110155832.15928-3-vladislav.valtchev@gmail.com> In-Reply-To: <20180110155832.15928-1-vladislav.valtchev@gmail.com> References: <20180110155832.15928-1-vladislav.valtchev@gmail.com> Sender: linux-trace-devel-owner@vger.kernel.org List-ID: Content-Length: 5122 This patch allows the plugins to be buildable out-of-tree when the 'O' variable is set at command line while invoking make. At this stage, when the 'O' variable is set, the out-of-tree build will fail (as it *already* does on the master branch) but with errors unrelated with the plugins: with this patch the final goal of a fully working out-of-tree build gets closer. In successive steps, the remaining Makefiles will be made to support out-of-tree builds, until everything works. NOTE: the regular in-tree build of all targets clearly continues to work. Signed-off-by: Vladislav Valtchev (VMware) --- Makefile | 10 +++++----- plugins/Makefile | 37 ++++++++++++++++++++++--------------- scripts/utils.mk | 2 +- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index d1fed58..73e14e8 100644 --- a/Makefile +++ b/Makefile @@ -260,10 +260,10 @@ trace-graph: force $(CMD_TARGETS) $(Q)$(MAKE) -C $(src)/kernel-shark $@ $(LIBTRACEEVENT_SHARED): force - $(Q)$(MAKE) -C $(src)/lib/traceevent $(obj)/lib/traceevent/libtraceevent.so + $(Q)$(MAKE) -C $(src)/lib/traceevent $@ $(LIBTRACEEVENT_STATIC): force - $(Q)$(MAKE) -C $(src)/lib/traceevent $(obj)/lib/traceevent/libtraceevent.a + $(Q)$(MAKE) -C $(src)/lib/traceevent $@ $(LIBTRACECMD_STATIC): force $(obj)/plugins/trace_plugin_dir $(Q)$(MAKE) -C $(src)/lib/trace-cmd libtracecmd.a @@ -282,10 +282,10 @@ plugins: force $(obj)/plugins/trace_plugin_dir $(obj)/plugins/trace_python_dir $(Q)$(MAKE) -C $(src)/plugins $(obj)/plugins/trace_plugin_dir: force - $(Q)$(MAKE) -C $(src)/plugins trace_plugin_dir + $(Q)$(MAKE) -C $(src)/plugins $@ $(obj)/plugins/trace_python_dir: force - $(Q)$(MAKE) -C $(src)/plugins trace_python_dir + $(Q)$(MAKE) -C $(src)/plugins $@ show_gui_make: @echo "Note: to build the gui, type \"make gui\"" @@ -389,7 +389,7 @@ PHONY += python-plugin python-plugin: $(PYTHON_PLUGINS) plugin_python.so: force $(obj)/plugins/trace_python_dir - $(Q)$(MAKE) -C $(src)/plugins plugin_python.so + $(Q)$(MAKE) -C $(src)/plugins $(obj)/plugins/plugin_python.so dist: git archive --format=tar --prefix=trace-cmd-$(TRACECMD_VERSION)/ HEAD \ diff --git a/plugins/Makefile b/plugins/Makefile index 7a09b82..cff71f1 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -1,5 +1,7 @@ include $(src)/scripts/utils.mk +bdir:=$(obj)/plugins + PLUGIN_OBJS = PLUGIN_OBJS += plugin_jbd2.o PLUGIN_OBJS += plugin_hrtimer.o @@ -14,33 +16,38 @@ PLUGIN_OBJS += plugin_cfg80211.o PLUGIN_OBJS += plugin_blk.o PLUGIN_OBJS += plugin_tlb.o -PLUGINS := $(PLUGIN_OBJS:.o=.so) -DEPS := $(PLUGIN_OBJS:%.o=.%.d) +PLUGIN_OBJS := $(PLUGIN_OBJS:%.o=$(bdir)/%.o) +PLUGINS := $(PLUGIN_OBJS:$(bdir)/%.o=$(bdir)/%.so) +DEPS := $(PLUGIN_OBJS:$(bdir)/%.o=$(bdir)/.%.d) all: $(PLUGINS) -$(PLUGIN_OBJS): %.o : %.c +$(bdir): + @mkdir -p $(bdir) + +$(PLUGIN_OBJS): | $(bdir) +$(DEPS): | $(bdir) + +$(PLUGIN_OBJS): $(bdir)/%.o : %.c $(Q)$(do_compile_plugin_obj) -$(PLUGINS): %.so: %.o +$(PLUGINS): $(bdir)/%.so: $(bdir)/%.o $(Q)$(do_plugin_build) -$(DEPS): .%.d: %.c +$(DEPS): $(bdir)/.%.d: %.c $(Q)$(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@ -$(PLUGIN_OBJS): %.o : .%.d +$(PLUGIN_OBJS): $(bdir)/%.o : $(bdir)/.%.d -CFLAGS_plugin_python.o += $(PYTHON_DIR_SQ) - -plugin_python.o: %.o : %.c trace_python_dir +$(bdir)/plugin_python.o: $(bdir)/%.o : %.c $(bdir)/trace_python_dir $(Q)$(do_compile_python_plugin_obj) -plugin_python.so: %.so: %.o +$(bdir)/plugin_python.so: $(bdir)/%.so: $(bdir)/%.o $(Q)$(do_python_plugin_build) -PLUGINS_INSTALL = $(subst .so,.install,$(PLUGINS)) $(subst .so,.install,$(PYTHON_PLUGINS)) +PLUGINS_INSTALL = $(subst .so,.install,$(PLUGINS)) -$(PLUGINS_INSTALL): %.install : %.so force +$(PLUGINS_INSTALL): $(bdir)/%.install : $(bdir)/%.so force $(Q)$(call do_install_data,$<,$(plugin_dir_SQ)) install_plugins: $(PLUGINS_INSTALL) @@ -49,10 +56,10 @@ install_plugins: $(PLUGINS_INSTALL) # and $(PYTHON_DIR) change. Without them, a full clean build would necessary # in order to get the binaries updated. -trace_plugin_dir: force +$(bdir)/trace_plugin_dir: $(bdir) force $(Q)$(N)$(call update_dir, 'PLUGIN_DIR=$(PLUGIN_DIR)') -trace_python_dir: force +$(bdir)/trace_python_dir: $(bdir) force $(Q)$(N)$(call update_dir, 'PYTHON_DIR=$(PYTHON_DIR)') @@ -63,7 +70,7 @@ ifneq ($(dep_includes),) endif clean: - $(RM) *.a *.so *.o .*.d trace_plugin_dir trace_python_dir + $(RM) -f $(bdir)/*.a $(bdir)/*.so $(bdir)/*.o $(bdir)/.*.d $(bdir)/trace_plugin_dir $(bdir)/trace_python_dir force: .PHONY: clean force \ No newline at end of file diff --git a/scripts/utils.mk b/scripts/utils.mk index 043a68a..06e8dc3 100644 --- a/scripts/utils.mk +++ b/scripts/utils.mk @@ -64,7 +64,7 @@ do_plugin_build = \ do_compile_python_plugin_obj = \ ($(print_plugin_obj_compile) \ - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$@) $(PYTHON_INCLUDES) -fPIC -o $@ $<) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PYTHON_DIR_SQ) $(PYTHON_INCLUDES) -fPIC -o $@ $<) do_python_plugin_build = \ ($(print_plugin_build) \