From patchwork Wed Dec 20 18:07:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vladislav Valtchev (VMware)" X-Patchwork-Id: 10758327 Return-Path: linux-trace-devel-owner@vger.kernel.org Received: from mail-wm0-f67.google.com ([74.125.82.67]:38431 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932308AbdLTSIM (ORCPT ); Wed, 20 Dec 2017 13:08:12 -0500 From: "Vladislav Valtchev (VMware)" To: rostedt@goodmis.org Cc: y.karadz@gmail.com, linux-trace-devel@vger.kernel.org, linux-kernel@vger.kernel.org, "Vladislav Valtchev (VMware)" Subject: [PATCH 09/18] trace-cmd: Move GUI headers in kernel-shark/include Date: Wed, 20 Dec 2017 20:07:39 +0200 Message-Id: <20171220180748.17273-10-vladislav.valtchev@gmail.com> In-Reply-To: <20171220180748.17273-1-vladislav.valtchev@gmail.com> References: <20171220180748.17273-1-vladislav.valtchev@gmail.com> Sender: linux-trace-devel-owner@vger.kernel.org List-ID: Content-Length: 4848 This patch moves, as part of a bigger code base restructuring, all the header files of kernelshark in a dedicated directory. The next patch will move all of kernelshark's source files in kernel-shark/. Signed-off-by: Vladislav Valtchev (VMware) --- Makefile | 3 ++- cpu.h => kernel-shark/include/cpu.h | 0 kernel-shark.h => kernel-shark/include/kernel-shark.h | 0 kshark-plugin.h => kernel-shark/include/kshark-plugin.h | 0 trace-capture.h => kernel-shark/include/trace-capture.h | 0 trace-compat.h => kernel-shark/include/trace-compat.h | 0 trace-filter-hash.h => kernel-shark/include/trace-filter-hash.h | 0 trace-filter.h => kernel-shark/include/trace-filter.h | 0 trace-graph.h => kernel-shark/include/trace-graph.h | 0 trace-gui.h => kernel-shark/include/trace-gui.h | 0 trace-view-store.h => kernel-shark/include/trace-view-store.h | 0 trace-view.h => kernel-shark/include/trace-view.h | 0 trace-xml.h => kernel-shark/include/trace-xml.h | 0 13 files changed, 2 insertions(+), 1 deletion(-) rename cpu.h => kernel-shark/include/cpu.h (100%) rename kernel-shark.h => kernel-shark/include/kernel-shark.h (100%) rename kshark-plugin.h => kernel-shark/include/kshark-plugin.h (100%) rename trace-capture.h => kernel-shark/include/trace-capture.h (100%) rename trace-compat.h => kernel-shark/include/trace-compat.h (100%) rename trace-filter-hash.h => kernel-shark/include/trace-filter-hash.h (100%) rename trace-filter.h => kernel-shark/include/trace-filter.h (100%) rename trace-graph.h => kernel-shark/include/trace-graph.h (100%) rename trace-gui.h => kernel-shark/include/trace-gui.h (100%) rename trace-view-store.h => kernel-shark/include/trace-view-store.h (100%) rename trace-view.h => kernel-shark/include/trace-view.h (100%) rename trace-xml.h => kernel-shark/include/trace-xml.h (100%) diff --git a/Makefile b/Makefile index 8b34705..a72a2c9 100644 --- a/Makefile +++ b/Makefile @@ -242,6 +242,7 @@ INCLUDES += -I$(src)/include/traceevent INCLUDES += -I$(src)/include/trace-cmd INCLUDES += -I$(src)/lib/traceevent/include INCLUDES += -I$(src)/lib/trace-cmd/include +INCLUDES += -I$(src)/kernel-shark/include include $(src)/features.mk @@ -596,7 +597,7 @@ ctracecmd.so: $(TCMD_LIB_OBJS) ctracecmd.i $(CC) --shared $(LIBTRACECMD_STATIC) $(LDFLAGS) ctracecmd_wrap.o -o ctracecmd.so ctracecmdgui.so: $(TRACE_VIEW_OBJS) $(LIBTRACECMD_STATIC) - swig -Wall -python -noproxy ctracecmdgui.i + swig -Wall -python -noproxy -I$(src)/kernel-shark/include ctracecmdgui.i $(CC) -fpic -c $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) ctracecmdgui_wrap.c $(CC) --shared $^ $(LDFLAGS) $(LIBS) $(CONFIG_LIBS) ctracecmdgui_wrap.o -o ctracecmdgui.so diff --git a/cpu.h b/kernel-shark/include/cpu.h similarity index 100% rename from cpu.h rename to kernel-shark/include/cpu.h diff --git a/kernel-shark.h b/kernel-shark/include/kernel-shark.h similarity index 100% rename from kernel-shark.h rename to kernel-shark/include/kernel-shark.h diff --git a/kshark-plugin.h b/kernel-shark/include/kshark-plugin.h similarity index 100% rename from kshark-plugin.h rename to kernel-shark/include/kshark-plugin.h diff --git a/trace-capture.h b/kernel-shark/include/trace-capture.h similarity index 100% rename from trace-capture.h rename to kernel-shark/include/trace-capture.h diff --git a/trace-compat.h b/kernel-shark/include/trace-compat.h similarity index 100% rename from trace-compat.h rename to kernel-shark/include/trace-compat.h diff --git a/trace-filter-hash.h b/kernel-shark/include/trace-filter-hash.h similarity index 100% rename from trace-filter-hash.h rename to kernel-shark/include/trace-filter-hash.h diff --git a/trace-filter.h b/kernel-shark/include/trace-filter.h similarity index 100% rename from trace-filter.h rename to kernel-shark/include/trace-filter.h diff --git a/trace-graph.h b/kernel-shark/include/trace-graph.h similarity index 100% rename from trace-graph.h rename to kernel-shark/include/trace-graph.h diff --git a/trace-gui.h b/kernel-shark/include/trace-gui.h similarity index 100% rename from trace-gui.h rename to kernel-shark/include/trace-gui.h diff --git a/trace-view-store.h b/kernel-shark/include/trace-view-store.h similarity index 100% rename from trace-view-store.h rename to kernel-shark/include/trace-view-store.h diff --git a/trace-view.h b/kernel-shark/include/trace-view.h similarity index 100% rename from trace-view.h rename to kernel-shark/include/trace-view.h diff --git a/trace-xml.h b/kernel-shark/include/trace-xml.h similarity index 100% rename from trace-xml.h rename to kernel-shark/include/trace-xml.h