From patchwork Wed Dec 20 18:07:32 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: 10758359 Return-Path: linux-trace-devel-owner@vger.kernel.org Received: from mail-wr0-f195.google.com ([209.85.128.195]:44485 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755874AbdLTSID (ORCPT ); Wed, 20 Dec 2017 13:08:03 -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 02/18] trace-cmd: Move libtraceevent headers in include/traceevent Date: Wed, 20 Dec 2017 20:07:32 +0200 Message-Id: <20171220180748.17273-3-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: 2173 This patch moves event-parse.h and kbuffer.h in include/traceevent as part of a bigger restructuring plan of trace-cmd's code base. In this case, the new directory will be the "public headers" directory of the traceevent library. Signed-off-by: Vladislav Valtchev (VMware) --- Makefile | 5 +++-- event-parse.h => include/traceevent/event-parse.h | 0 kbuffer.h => include/traceevent/kbuffer.h | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename event-parse.h => include/traceevent/event-parse.h (100%) rename kbuffer.h => include/traceevent/kbuffer.h (100%) diff --git a/Makefile b/Makefile index bd2d844..a5aea70 100644 --- a/Makefile +++ b/Makefile @@ -237,6 +237,7 @@ TRACECMD_VERSION = $(TC_VERSION).$(TC_PATCHLEVEL).$(TC_EXTRAVERSION) KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION) INCLUDES = -I. -I ./include -I $(srctree)/../../include $(CONFIG_INCLUDES) +INCLUDES += -I$(src)/include/traceevent include $(src)/features.mk @@ -604,7 +605,7 @@ install_gui: install_cmd gui install_libs: libs $(Q)$(call do_install,libtracecmd.so,$(libdir_SQ)) $(Q)$(call do_install,libtraceevent.so,$(libdir_SQ)) - $(Q)$(call do_install,event-parse.h,$(includedir_SQ)) + $(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)) $(Q)$(call do_install,trace-cmd.h,$(includedir_SQ)) doc: @@ -634,7 +635,7 @@ PYTHON_LDFLAGS = `pkg-config --libs $(PYTHON_VERS)` \ PYGTK_CFLAGS = `pkg-config --cflags pygtk-2.0` ctracecmd.so: $(TCMD_LIB_OBJS) ctracecmd.i - swig -Wall -python -noproxy ctracecmd.i + swig -Wall -python -noproxy -I$(src)/include/traceevent ctracecmd.i $(CC) -fpic -c $(CPPFLAGS) $(CFLAGS) $(PYTHON_INCLUDES) ctracecmd_wrap.c $(CC) --shared $(TCMD_LIB_OBJS) $(LDFLAGS) ctracecmd_wrap.o -o ctracecmd.so diff --git a/event-parse.h b/include/traceevent/event-parse.h similarity index 100% rename from event-parse.h rename to include/traceevent/event-parse.h diff --git a/kbuffer.h b/include/traceevent/kbuffer.h similarity index 100% rename from kbuffer.h rename to include/traceevent/kbuffer.h