[PATCH 09/18] trace-cmd: Move GUI headers in kernel-shark/include

From: Vladislav Valtchev (VMware)
Date: Wed Dec 20 2017 - 13:08:29 EST


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) <vladislav.valtchev@xxxxxxxxx>
---
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
--
2.14.1