Commit 4a37710b authored by Brice Videau's avatar Brice Videau
Browse files

Move utils headers to include sub-directory.

parent 1b7f1161
Pipeline #12958 canceled with stage
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
LTTNG_FLAGS=-fPIC -Wall -Wextra -Wno-unused-parameter -Wno-type-limits -Wno-sign-compare -Werror -I$(top_srcdir)/utils -I$(srcdir)/include -I../utils -I./ LTTNG_FLAGS=-fPIC -Wall -Wextra -Wno-unused-parameter -Wno-type-limits -Wno-sign-compare -Werror -I$(top_srcdir)/utils -I$(top_srcdir)/utils/include -I$(srcdir)/include -I../utils -I./
CUDA_PROBES_TP = \ CUDA_PROBES_TP = \
cuda_tracepoints.tp cuda_tracepoints.tp
...@@ -213,7 +213,7 @@ nodist_libTracerCUDA_la_SOURCES = \ ...@@ -213,7 +213,7 @@ nodist_libTracerCUDA_la_SOURCES = \
$(CUDA_PROBES_INCL) \ $(CUDA_PROBES_INCL) \
tracer_cuda.c tracer_cuda.c
libTracerCUDA_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(srcdir)/include -I../utils -I./ libTracerCUDA_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(top_srcdir)/utils/include -I$(srcdir)/include -I../utils -I./
libTracerCUDA_la_CFLAGS = -Wall -Wextra -Werror $(LIBFFI_CFLAGS) $(LTTNG_UST_CFLAGS) libTracerCUDA_la_CFLAGS = -Wall -Wextra -Werror $(LIBFFI_CFLAGS) $(LTTNG_UST_CFLAGS)
libTracerCUDA_la_LDFLAGS = $(LTTNG_UST_LIBS) -ldl -lpthread $(LIBFFI_LIBS) libTracerCUDA_la_LDFLAGS = $(LTTNG_UST_LIBS) -ldl -lpthread $(LIBFFI_LIBS)
libTracerCUDA_la_LDFLAGS += -version-info 1:0:0 libTracerCUDA_la_LDFLAGS += -version-info 1:0:0
...@@ -223,7 +223,7 @@ nodist_libTracerCUDART_la_SOURCES = \ ...@@ -223,7 +223,7 @@ nodist_libTracerCUDART_la_SOURCES = \
$(CUDART_PROBES_INCL) \ $(CUDART_PROBES_INCL) \
tracer_cudart.c tracer_cudart.c
libTracerCUDART_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(srcdir)/include -I../utils -I./ libTracerCUDART_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(top_srcdir)/utils/include -I$(srcdir)/include -I../utils -I./
libTracerCUDART_la_CFLAGS = -Wall -Wextra -Werror $(LIBFFI_CFLAGS) $(LTTNG_UST_CFLAGS) libTracerCUDART_la_CFLAGS = -Wall -Wextra -Werror $(LIBFFI_CFLAGS) $(LTTNG_UST_CFLAGS)
libTracerCUDART_la_LDFLAGS = $(LTTNG_UST_LIBS) -ldl -lpthread $(LIBFFI_LIBS) libTracerCUDART_la_LDFLAGS = $(LTTNG_UST_LIBS) -ldl -lpthread $(LIBFFI_LIBS)
libTracerCUDART_la_LDFLAGS += -version-number 11:0:3 libTracerCUDART_la_LDFLAGS += -version-number 11:0:3
......
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
LTTNG_FLAGS=-fPIC -Wall -Wextra -Wno-unused-parameter -Wno-type-limits -Wno-sign-compare -Werror -I$(top_srcdir)/utils -I$(srcdir)/include -I../utils -I./ LTTNG_FLAGS=-fPIC -Wall -Wextra -Wno-unused-parameter -Wno-type-limits -Wno-sign-compare -Werror -I$(top_srcdir)/utils -I$(top_srcdir)/utils/include -I$(srcdir)/include -I../utils -I./
OPENCL_PROBES_TP = \ OPENCL_PROBES_TP = \
opencl_tracepoints.tp\ opencl_tracepoints.tp\
...@@ -104,7 +104,7 @@ nodist_libTracerOpenCL_la_SOURCES = \ ...@@ -104,7 +104,7 @@ nodist_libTracerOpenCL_la_SOURCES = \
tracer_opencl.h \ tracer_opencl.h \
tracer_opencl.c tracer_opencl.c
libTracerOpenCL_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(srcdir)/include -I../utils -I./ libTracerOpenCL_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(top_srcdir)/utils/include -I$(srcdir)/include -I../utils -I./
libTracerOpenCL_la_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror $(LIBFFI_CFLAGS) $(LTTNG_UST_CFLAGS) libTracerOpenCL_la_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror $(LIBFFI_CFLAGS) $(LTTNG_UST_CFLAGS)
libTracerOpenCL_la_LDFLAGS = $(LTTNG_UST_LIBS) -ldl -lpthread $(LIBFFI_LIBS) libTracerOpenCL_la_LDFLAGS = $(LTTNG_UST_LIBS) -ldl -lpthread $(LIBFFI_LIBS)
libTracerOpenCL_la_LDFLAGS += -Wl,--version-script,$(srcdir)/tracer_opencl.map -version-info 1:0:0 libTracerOpenCL_la_LDFLAGS += -Wl,--version-script,$(srcdir)/tracer_opencl.map -version-info 1:0:0
...@@ -140,7 +140,7 @@ nodist_libCLProf_la_SOURCES = \ ...@@ -140,7 +140,7 @@ nodist_libCLProf_la_SOURCES = \
libCLProf_la_SOURCES = \ libCLProf_la_SOURCES = \
babeltrace_cl.h babeltrace_cl.h
libCLProf_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(srcdir)/include -I./ libCLProf_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(top_srcdir)/utils/include -I$(srcdir)/include -I./
libCLProf_la_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS) libCLProf_la_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS)
libCLProf_la_CXXFLAGS = -std=c++17 -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS) libCLProf_la_CXXFLAGS = -std=c++17 -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS)
libCLProf_la_LDFLAGS = $(BABELTRACE2_LIBS) -avoid-version -module libCLProf_la_LDFLAGS = $(BABELTRACE2_LIBS) -avoid-version -module
...@@ -167,7 +167,7 @@ nodist_libBabeltraceCL_la_SOURCES = \ ...@@ -167,7 +167,7 @@ nodist_libBabeltraceCL_la_SOURCES = \
libBabeltraceCL_la_SOURCES = \ libBabeltraceCL_la_SOURCES = \
babeltrace_cl.c \ babeltrace_cl.c \
babeltrace_cl.h babeltrace_cl.h
libBabeltraceCL_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(srcdir)/include -I./ libBabeltraceCL_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(top_srcdir)/utils/include -I$(srcdir)/include -I./
libBabeltraceCL_la_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS) libBabeltraceCL_la_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS)
libBabeltraceCL_la_LDFLAGS = $(BABELTRACE2_LIBS) -avoid-version -module libBabeltraceCL_la_LDFLAGS = $(BABELTRACE2_LIBS) -avoid-version -module
...@@ -191,7 +191,7 @@ nodist_libTestingCLProf_la_SOURCES = \ ...@@ -191,7 +191,7 @@ nodist_libTestingCLProf_la_SOURCES = \
libTestingCLProf_la_SOURCES = \ libTestingCLProf_la_SOURCES = \
babeltrace_cl.h babeltrace_cl.h
libTestingCLProf_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(srcdir)/include -I./ libTestingCLProf_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(top_srcdir)/utils/include -I$(srcdir)/include -I./
libTestingCLProf_la_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS) libTestingCLProf_la_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS)
libTestingCLProf_la_CXXFLAGS = -std=c++17 -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS) libTestingCLProf_la_CXXFLAGS = -std=c++17 -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS)
libTestingCLProf_la_LDFLAGS = $(BABELTRACE2_LIBS) -avoid-version -module libTestingCLProf_la_LDFLAGS = $(BABELTRACE2_LIBS) -avoid-version -module
......
noinst_HEADERS = lttng/tracepoint.h utarray.h uthash.h utlist.h noinst_HEADERS = \
lttng/tracepoint.h \
include/utarray.h \
include/uthash.h \
include/utlist.h
nodist_noinst_HEADERS = lttng/tracepoint_gen.h xprof_utils.h xprof.sh.erb nodist_noinst_HEADERS = lttng/tracepoint_gen.h xprof_utils.h xprof.sh.erb
lttng/tracepoint_gen.h: $(srcdir)/tracepoint_gen.rb lttng/tracepoint_gen.h: $(srcdir)/tracepoint_gen.rb
......
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
LTTNG_FLAGS=-fPIC -Wall -Wextra -Wno-unused-parameter -Wno-type-limits -Wno-sign-compare -Werror -I$(top_srcdir)/utils -I$(srcdir)/include -I../utils -I./ LTTNG_FLAGS=-fPIC -Wall -Wextra -Wno-unused-parameter -Wno-type-limits -Wno-sign-compare -Werror -I$(top_srcdir)/utils -I$(top_srcdir)/utils/include -I$(srcdir)/include -I../utils -I./
ZE_PROBES_TP = \ ZE_PROBES_TP = \
ze_tracepoints.tp \ ze_tracepoints.tp \
...@@ -203,7 +203,7 @@ nodist_libTracerZE_la_SOURCES = \ ...@@ -203,7 +203,7 @@ nodist_libTracerZE_la_SOURCES = \
$(ZE_STATIC_PROBES_INCL) \ $(ZE_STATIC_PROBES_INCL) \
tracer_ze.c tracer_ze.c
libTracerZE_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(srcdir)/include -I../utils -I./ libTracerZE_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(top_srcdir)/utils/include -I$(srcdir)/include -I../utils -I./
libTracerZE_la_CFLAGS = -Wall -Wextra -Werror $(LIBFFI_CFLAGS) $(LTTNG_UST_CFLAGS) libTracerZE_la_CFLAGS = -Wall -Wextra -Werror $(LIBFFI_CFLAGS) $(LTTNG_UST_CFLAGS)
libTracerZE_la_LDFLAGS = $(LTTNG_UST_LIBS) -ldl -lpthread $(LIBFFI_LIBS) libTracerZE_la_LDFLAGS = $(LTTNG_UST_LIBS) -ldl -lpthread $(LIBFFI_LIBS)
libTracerZE_la_LIBADD = libzetracepoints.la libTracerZE_la_LIBADD = libzetracepoints.la
...@@ -247,7 +247,7 @@ nodist_libZEProf_la_SOURCES = \ ...@@ -247,7 +247,7 @@ nodist_libZEProf_la_SOURCES = \
libZEProf_la_SOURCES = \ libZEProf_la_SOURCES = \
babeltrace_ze.h babeltrace_ze.h
libZEProf_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(srcdir)/include -I./ libZEProf_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(top_srcdir)/utils/include -I$(srcdir)/include -I./
libZEProf_la_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS) libZEProf_la_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS)
libZEProf_la_CXXFLAGS = -std=c++17 -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS) libZEProf_la_CXXFLAGS = -std=c++17 -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS)
libZEProf_la_LDFLAGS = $(BABELTRACE2_LIBS) -avoid-version -module libZEProf_la_LDFLAGS = $(BABELTRACE2_LIBS) -avoid-version -module
...@@ -285,7 +285,7 @@ nodist_libBabeltraceZE_la_SOURCES = \ ...@@ -285,7 +285,7 @@ nodist_libBabeltraceZE_la_SOURCES = \
libBabeltraceZE_la_SOURCES = \ libBabeltraceZE_la_SOURCES = \
babeltrace_ze.c \ babeltrace_ze.c \
babeltrace_ze.h babeltrace_ze.h
libBabeltraceZE_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(srcdir)/include -I./ libBabeltraceZE_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(top_srcdir)/utils/include -I$(srcdir)/include -I./
libBabeltraceZE_la_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS) libBabeltraceZE_la_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS)
libBabeltraceZE_la_LDFLAGS = $(BABELTRACE2_LIBS) -avoid-version -module libBabeltraceZE_la_LDFLAGS = $(BABELTRACE2_LIBS) -avoid-version -module
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment