[6/6] libtraceevent: Move source files into src/ directory

Commit Message

Steven Rostedt Dec. 9, 2020, 4:19 a.m. UTC

From: "Steven Rostedt (VMware)" <[e-mail]>

To clean up the source directory, create a "src" directory to store the
header and C files.

Signed-off-by: Steven Rostedt (VMware) <[e-mail]>
---
 Makefile                                       | 18 +++++++++++-------
 plugins/Makefile                               |  2 +-
 Build => src/Build                             |  0
 src/Makefile                                   | 12 ++++++++++++
 event-parse-api.c => src/event-parse-api.c     |  0
 event-parse-local.h => src/event-parse-local.h |  0
 event-parse.c => src/event-parse.c             |  0
 event-parse.h => src/event-parse.h             |  0
 event-plugin.c => src/event-plugin.c           |  0
 event-utils.h => src/event-utils.h             |  0
 kbuffer-parse.c => src/kbuffer-parse.c         |  0
 kbuffer.h => src/kbuffer.h                     |  0
 parse-filter.c => src/parse-filter.c           |  0
 parse-utils.c => src/parse-utils.c             |  0
 tep_strerror.c => src/tep_strerror.c           |  0
 trace-seq.c => src/trace-seq.c                 |  0
 trace-seq.h => src/trace-seq.h                 |  0
 17 files changed, 24 insertions(+), 8 deletions(-)
 rename Build => src/Build (100%)
 create mode 100644 src/Makefile
 rename event-parse-api.c => src/event-parse-api.c (100%)
 rename event-parse-local.h => src/event-parse-local.h (100%)
 rename event-parse.c => src/event-parse.c (100%)
 rename event-parse.h => src/event-parse.h (100%)
 rename event-plugin.c => src/event-plugin.c (100%)
 rename event-utils.h => src/event-utils.h (100%)
 rename kbuffer-parse.c => src/kbuffer-parse.c (100%)
 rename kbuffer.h => src/kbuffer.h (100%)
 rename parse-filter.c => src/parse-filter.c (100%)
 rename parse-utils.c => src/parse-utils.c (100%)
 rename tep_strerror.c => src/tep_strerror.c (100%)
 rename trace-seq.c => src/trace-seq.c (100%)
 rename trace-seq.h => src/trace-seq.h (100%)

Patch

diff --git a/Makefile b/Makefile
index 9ec880c0105b..9044536d2fcf 100644
--- a/Makefile
+++ b/Makefile
@@ -135,7 +135,7 @@  MAKEOVERRIDES=
 export srctree OUTPUT CC LD CFLAGS V
 build := -f $(srctree)/build/Makefile.build dir=. obj
 
-TE_IN      := $(OUTPUT)libtraceevent-in.o
+TE_IN      := $(OUTPUT)src/libtraceevent-in.o
 LIB_TARGET := $(addprefix $(OUTPUT),$(LIB_TARGET))
 
 CMD_TARGETS = $(LIB_TARGET) $(PKG_CONFIG_FILE)
@@ -147,7 +147,7 @@  all: all_cmd plugins
 all_cmd: $(CMD_TARGETS)
 
 $(TE_IN): force
-	$(Q)$(MAKE) $(build)=libtraceevent
+	$(Q)$(call descend,src,libtraceevent)
 
 $(OUTPUT)$(LIBTRACEEVENT_SHARED): $(TE_IN)
 	$(Q)mkdir -p $(OUTPUT)$(bdir)
@@ -252,14 +252,14 @@  install_pkgconfig: $(PKG_CONFIG_FILE)
 
 install_headers:
 	$(call QUIET_INSTALL, headers) \
-		$(call do_install,event-parse.h,$(includedir_SQ),644); \
-		$(call do_install,event-utils.h,$(includedir_SQ),644); \
-		$(call do_install,trace-seq.h,$(includedir_SQ),644); \
-		$(call do_install,kbuffer.h,$(includedir_SQ),644)
+		$(call do_install,src/event-parse.h,$(includedir_SQ),644); \
+		$(call do_install,src/event-utils.h,$(includedir_SQ),644); \
+		$(call do_install,src/trace-seq.h,$(includedir_SQ),644); \
+		$(call do_install,src/kbuffer.h,$(includedir_SQ),644)
 
 install: install_lib
 
-clean: clean_plugins
+clean: clean_plugins clean_src
 	$(call QUIET_CLEAN, libtraceevent) \
 		$(RM) $(OUTPUT)*.o $(OUTPUT)*~ $(TARGETS) $(OUTPUT)*.a $(OUTPUT)*.so $(VERSION_FILES) $(OUTPUT).*.d $(OUTPUT).*.cmd; \
 		$(RM) TRACEEVENT-CFLAGS $(OUTPUT)tags $(OUTPUT)TAGS; \
@@ -310,6 +310,10 @@  PHONY += clean_plugins
 clean_plugins:
 	$(call descend,plugins,clean)
 
+PHONY += clean_src
+clean_src:
+	$(call descend,src,clean)
+
 force:
 
 # Declare the contents of the .PHONY variable as phony.  We keep that
diff --git a/plugins/Makefile b/plugins/Makefile
index a8868d01b09b..e8b8850a19a9 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -93,7 +93,7 @@  CONFIG_FLAGS   =
 OBJ            = $@
 N              =
 
-INCLUDES = -I. -I.. -I $(srctree)/include $(CONFIG_INCLUDES)
+INCLUDES = -I. -I.. -I../src -I $(srctree)/include $(CONFIG_INCLUDES)
 
 # Set compile option CFLAGS
 ifdef EXTRA_CFLAGS
diff --git a/Build b/src/Build
similarity index 100%
rename from Build
rename to src/Build
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 000000000000..c62104b77c86
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,12 @@ 
+
+include ../scripts/Makefile.include
+
+build := -f $(srctree)/build/Makefile.build dir=. obj
+
+libtraceevent: $(libtraceevent-y)
+	$(Q)$(MAKE) $(build)=libtraceevent
+
+clean:
+	$(call QUIET_CLEAN, trace_src) \
+		$(RM) $(OUTPUT)*.o $(OUTPUT)*~ .*.d .*.cmd
+
diff --git a/event-parse-api.c b/src/event-parse-api.c
similarity index 100%
rename from event-parse-api.c
rename to src/event-parse-api.c
diff --git a/event-parse-local.h b/src/event-parse-local.h
similarity index 100%
rename from event-parse-local.h
rename to src/event-parse-local.h
diff --git a/event-parse.c b/src/event-parse.c
similarity index 100%
rename from event-parse.c
rename to src/event-parse.c
diff --git a/event-parse.h b/src/event-parse.h
similarity index 100%
rename from event-parse.h
rename to src/event-parse.h
diff --git a/event-plugin.c b/src/event-plugin.c
similarity index 100%
rename from event-plugin.c
rename to src/event-plugin.c
diff --git a/event-utils.h b/src/event-utils.h
similarity index 100%
rename from event-utils.h
rename to src/event-utils.h
diff --git a/kbuffer-parse.c b/src/kbuffer-parse.c
similarity index 100%
rename from kbuffer-parse.c
rename to src/kbuffer-parse.c
diff --git a/kbuffer.h b/src/kbuffer.h
similarity index 100%
rename from kbuffer.h
rename to src/kbuffer.h
diff --git a/parse-filter.c b/src/parse-filter.c
similarity index 100%
rename from parse-filter.c
rename to src/parse-filter.c
diff --git a/parse-utils.c b/src/parse-utils.c
similarity index 100%
rename from parse-utils.c
rename to src/parse-utils.c
diff --git a/tep_strerror.c b/src/tep_strerror.c
similarity index 100%
rename from tep_strerror.c
rename to src/tep_strerror.c
diff --git a/trace-seq.c b/src/trace-seq.c
similarity index 100%
rename from trace-seq.c
rename to src/trace-seq.c
diff --git a/trace-seq.h b/src/trace-seq.h
similarity index 100%
rename from trace-seq.h
rename to src/trace-seq.h