[v2,24/24] trace-cmd: Make the GUI targets buildable out-of-tree

Message ID	20180206084906.9854-25-vladislav.valtchev@gmail.com (mailing list archive)
State	Accepted, archived
Headers	show Return-Path: linux-trace-devel-owner@vger.kernel.org Received: from mail-pl0-f68.google.com ([209.85.160.68]:44514 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752639AbeBFIt4 (ORCPT <rfc822;linux-trace-devel@vger.kernel.org>); Tue, 6 Feb 2018 03:49:56 -0500 Received: by mail-pl0-f68.google.com with SMTP id f8so843036plk.11 for <linux-trace-devel@vger.kernel.org>; Tue, 06 Feb 2018 00:49:56 -0800 (PST) From: "Vladislav Valtchev (VMware)" <vladislav.valtchev@gmail.com> To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, y.karadz@gmail.com, "Vladislav Valtchev (VMware)" <vladislav.valtchev@gmail.com> Subject: [PATCH v2 24/24] trace-cmd: Make the GUI targets buildable out-of-tree Date: Tue, 6 Feb 2018 10:49:06 +0200 Message-Id: <20180206084906.9854-25-vladislav.valtchev@gmail.com> In-Reply-To: <20180206084906.9854-1-vladislav.valtchev@gmail.com> References: <20180206084906.9854-1-vladislav.valtchev@gmail.com> Sender: linux-trace-devel-owner@vger.kernel.org List-ID: <linux-trace-devel.vger.kernel.org> Content-Length: 4606
Series	trace-cmd: restructure the project's source tree \| expand [v2,00/24] trace-cmd: restructure the project's source tree [v2,01/24] trace-cmd: Rename libparsevent to libtraceevent [v2,02/24] trace-cmd: Move libtraceevent headers in include/traceevent [v2,03/24] trace-cmd: Move trace-cmd headers in include/trace-cmd [v2,04/24] trace-cmd: Move event-utils.h in lib/traceevent/include [v2,05/24] trace-cmd: Extract part of Makefile in scripts/utils.mk [v2,06/24] trace-cmd: Move libtraceevent .c files in lib/traceevent [v2,07/24] trace-cmd: Move trace-hash-local.h in lib/trace-cmd/include [v2,08/24] trace-cmd: Move libtracecmd .c files in lib/trace-cmd [v2,09/24] trace-cmd: Move GUI headers in kernel-shark/include [v2,10/24] trace-cmd: Move GUI .c files in kernel-shark/ [v2,11/24] trace-cmd: Move plugin_ files in plugins/ [v2,12/24] trace-cmd: Fix the broken target ctracecmdgui.so [v2,13/24] trace-cmd: Move python-related files in python/ [v2,14/24] trace-cmd: Move tracecmd headers in tracecmd/include [v2,15/24] trace-cmd: Move version.h in include/ [v2,16/24] trace-cmd: Move trace-cmd app files in tracecmd/ [v2,17/24] trace-cmd: Fix the logic behind SWIG_DEFINED in the Makefile [v2,18/24] trace-cmd: Make the build to tell when python-dev is missing [v2,19/24] trace-cmd: Make libtraceevent builable out-of-tree [v2,20/24] trace-cmd: Make the plugins buildable out-of-tree [v2,21/24] trace-cmd: Make libtracecmd buildable out-of-tree [v2,22/24] trace-cmd: Make the trace-cmd target buildable out-of-tree [v2,23/24] trace-cmd: Make the python targets buildable out-of-tree [v2,24/24] trace-cmd: Make the GUI targets buildable out-of-tree

diff --git a/Makefile b/Makefile index 2f05cbb..dc512a1 100644 --- a/Makefile +++ b/Makefile @@ -190,6 +190,7 @@ INCLUDES += -I$(src)/lib/trace-cmd/include INCLUDES += -I$(src)/kernel-shark/include INCLUDES += -I$(src)/tracecmd/include INCLUDES += -I$(obj)/tracecmd/include +INCLUDES += -I$(obj)/kernel-shark/include include $(src)/features.mk @@ -229,7 +230,7 @@ LIBS += -laudit endif # Append required CFLAGS -override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) $(VAR_DIR) +override CFLAGS += $(INCLUDES) $(PLUGIN_DIR_SQ) $(VAR_DIR) override CFLAGS += $(udis86-flags) $(blk-flags) @@ -253,13 +254,13 @@ trace-cmd: force $(LIBTRACEEVENT_STATIC) $(LIBTRACECMD_STATIC) $(Q)$(MAKE) -C $(src)/tracecmd $(obj)/tracecmd/$@ kernelshark: force $(CMD_TARGETS) - $(Q)$(MAKE) -C $(src)/kernel-shark $@ + $(Q)$(MAKE) -C $(src)/kernel-shark $(obj)/kernel-shark/$@ trace-view: force $(CMD_TARGETS) - $(Q)$(MAKE) -C $(src)/kernel-shark $@ + $(Q)$(MAKE) -C $(src)/kernel-shark $(obj)/kernel-shark/$@ trace-graph: force $(CMD_TARGETS) - $(Q)$(MAKE) -C $(src)/kernel-shark $@ + $(Q)$(MAKE) -C $(src)/kernel-shark $(obj)/kernel-shark/$@ $(LIBTRACEEVENT_SHARED): force $(Q)$(MAKE) -C $(src)/lib/traceevent $@ diff --git a/kernel-shark/Makefile b/kernel-shark/Makefile index 8e3ba8b..8576f3d 100644 --- a/kernel-shark/Makefile +++ b/kernel-shark/Makefile @@ -5,6 +5,8 @@ PATCHLEVEL = 2 EXTRAVERSION = KERNELSHARK_VERSION = $(VERSION).$(PATCHLEVEL).$(EXTRAVERSION) +bdir:=$(obj)/kernel-shark + BUILDGUI := 1 include $(src)/scripts/utils.mk @@ -21,9 +23,9 @@ CONFIG_LIBS = $(shell pkg-config --libs $(PACKAGES)) CONFIG_FLAGS += $(HELP_DIR_SQ) -KS_VERSION := $(obj)/kernel-shark/include/ks_version.h +KS_VERSION := $(bdir)/include/ks_version.h -GUI_TARGETS = $(KS_VERSION) trace-graph trace-view kernelshark +GUI_TARGETS = $(KS_VERSION) $(bdir)/trace-graph $(bdir)/trace-view $(bdir)/kernelshark TRACE_GUI_OBJS = trace-filter.o trace-compat.o trace-filter-hash.o \ trace-dialog.o trace-xml.o @@ -34,16 +36,17 @@ TRACE_GRAPH_MAIN_OBJS = trace-graph-main.o $(TRACE_GRAPH_OBJS) $(TRACE_GUI_OBJS) KERNEL_SHARK_OBJS = $(TRACE_VIEW_OBJS) $(TRACE_GRAPH_OBJS) $(TRACE_GUI_OBJS) \ trace-capture.o kernel-shark.o +KERNEL_SHARK_OBJS := $(KERNEL_SHARK_OBJS:%.o=$(bdir)/%.o) +TRACE_VIEW_MAIN_OBJS := $(TRACE_VIEW_MAIN_OBJS:%.o=$(bdir)/%.o) +TRACE_GRAPH_MAIN_OBJS := $(TRACE_GRAPH_MAIN_OBJS:%.o=$(bdir)/%.o) + ALL_OBJS = $(KERNEL_SHARK_OBJS) $(TRACE_VIEW_MAIN_OBJS) $(TRACE_GRAPH_MAIN_OBJS) PIC_OBJS = $(TRACE_VIEW_OBJS) all_objs := $(sort $(ALL_OBJS)) pic_objs = $(sort $(PIC_OBJS)) -all_deps := $(all_objs:%.o=.%.d) +all_deps := $(all_objs:$(bdir)/%.o=$(bdir)/.%.d) -# Temporary HACK! -# This hack is OK only until the non-gui builds do not have any config_includes -# nor config flags. In case they do, keeping this hack might be a problem. override CFLAGS += $(CONFIG_INCLUDES) $(CONFIG_FLAGS) LIBS += -L$(LIBTRACEEVENT_DIR) -L$(LIBTRACECMD_DIR) @@ -51,29 +54,38 @@ LIBS += -ltracecmd -ltraceevent -ldl all: $(GUI_TARGETS) -$(KS_VERSION): force +$(bdir): + @mkdir -p $(bdir) + +$(bdir)/include: | $(bdir) + @mkdir -p $(bdir)/include + +$(all_objs): | $(bdir) +$(all_deps): | $(bdir) + +$(KS_VERSION): force | $(bdir)/include $(Q)$(call update_version.h) -kernelshark: $(KERNEL_SHARK_OBJS) +$(bdir)/kernelshark: $(KERNEL_SHARK_OBJS) $(Q)$(do_app_build) -trace-view: $(TRACE_VIEW_MAIN_OBJS) +$(bdir)/trace-view: $(TRACE_VIEW_MAIN_OBJS) $(Q)$(do_app_build) -trace-graph: $(TRACE_GRAPH_MAIN_OBJS) +$(bdir)/trace-graph: $(TRACE_GRAPH_MAIN_OBJS) $(Q)$(do_app_build) $(pic_objs): GENERATE_PIC := 1 -%.o: %.c +$(bdir)/%.o: %.c $(Q)$(call do_compile) -$(all_deps): .%.d: %.c +$(all_deps): $(bdir)/.%.d: %.c $(Q)$(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@ $(all_deps): $(KS_VERSION) -$(all_objs): %.o : .%.d +$(all_objs): $(bdir)/%.o : $(bdir)/.%.d dep_includes := $(wildcard $(DEPS)) @@ -82,7 +94,7 @@ ifneq ($(dep_includes),) endif clean: - $(RM) *.a *.so *.o .*.d $(GUI_TARGETS) + $(RM) $(bdir)/*.a $(bdir)/*.so $(bdir)/*.o $(bdir)/.*.d $(GUI_TARGETS) force: .PHONY: clean

[v2,24/24] trace-cmd: Make the GUI targets buildable out-of-tree

Commit Message

Patch