lkml.org 
[lkml]   [2017]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 02/18] trace-cmd: Move libtraceevent headers in include/traceevent
Date
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) <vladislav.valtchev@gmail.com>
---
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
--
2.14.1
\
 
 \ /
  Last update: 2017-12-20 19:14    [W:0.060 / U:0.272 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site