From 93d0f2eaff675059588e958e3de74a1bb7dd4028 Mon Sep 17 00:00:00 2001 From: Jan Blunck Date: Sun, 25 Oct 2009 13:57:45 +0100 Subject: [PATCH] Move immediate.h, marker.h and tracepoint.h to include/ust/ Move the primary header files to a common location and install them with ust/ prefix in /usr/include. Signed-off-by: Jan Blunck --- Makefile.am | 2 +- configure.ac | 1 + include/Makefile.am | 1 + {libust => include/ust}/immediate.h | 0 {libust => include/ust}/marker.h | 2 +- {libust => include/ust}/tracepoint.h | 2 +- libmallocwrap/Makefile.am | 2 +- libmallocwrap/mallocwrap.c | 2 +- libust/Makefile.am | 6 ++---- libust/channels.c | 2 +- libust/marker.c | 2 +- libust/tracectl.c | 2 +- libust/tracepoint.c | 2 +- libust/tracer.h | 2 +- tests/basic/Makefile.am | 2 +- tests/basic/basic.c | 3 +-- tests/basic_long/Makefile.am | 2 +- tests/basic_long/basic_long.c | 3 +-- tests/fork/Makefile.am | 2 +- tests/fork/fork.c | 3 +-- tests/fork/fork2.c | 2 +- tests/hello/Makefile.am | 2 +- tests/hello/hello.c | 6 +----- tests/hello/tp.c | 2 +- tests/hello/tp.h | 2 +- tests/hello2/Makefile.am | 2 +- tests/hello2/hello2.c | 3 ++- ustd/Makefile.am | 4 ++-- 28 files changed, 30 insertions(+), 36 deletions(-) create mode 100644 include/Makefile.am rename {libust => include/ust}/immediate.h (100%) rename {libust => include/ust}/marker.h (99%) rename {libust => include/ust}/tracepoint.h (99%) diff --git a/Makefile.am b/Makefile.am index 46dc86ca..1ab59487 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork +SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork include EXTRA_DIST = doc share/kernelcompat.h share/share.h share/usterr.h dist_bin_SCRIPTS = usttrace diff --git a/configure.ac b/configure.ac index 441caaa2..1070e268 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,7 @@ AC_CHECK_HEADERS([kcompat.h], [], [AC_MSG_ERROR([Cannot find kcompat headers (kc AC_CONFIG_FILES([ Makefile + include/Makefile libust/Makefile tests/Makefile tests/hello/Makefile diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 00000000..0a4f87da --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1 @@ +nobase_include_HEADERS = ust/immediate.h ust/marker.h ust/tracepoint.h diff --git a/libust/immediate.h b/include/ust/immediate.h similarity index 100% rename from libust/immediate.h rename to include/ust/immediate.h diff --git a/libust/marker.h b/include/ust/marker.h similarity index 99% rename from libust/marker.h rename to include/ust/marker.h index ad813bc2..cb2c46d9 100644 --- a/libust/marker.h +++ b/include/ust/marker.h @@ -26,7 +26,7 @@ #include //ust// #include -#include "immediate.h" +#include //ust// #include #include "kernelcompat.h" #include diff --git a/libust/tracepoint.h b/include/ust/tracepoint.h similarity index 99% rename from libust/tracepoint.h rename to include/ust/tracepoint.h index b1ee16d0..7cfdbb01 100644 --- a/libust/tracepoint.h +++ b/include/ust/tracepoint.h @@ -31,7 +31,7 @@ #define _LGPL_SOURCE #include -#include "immediate.h" +#include #include "kernelcompat.h" struct module; diff --git a/libmallocwrap/Makefile.am b/libmallocwrap/Makefile.am index 1f7dad39..fa093071 100644 --- a/libmallocwrap/Makefile.am +++ b/libmallocwrap/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust +INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/include lib_LTLIBRARIES = libmallocwrap.la libmallocwrap_la_SOURCES = mallocwrap.c diff --git a/libmallocwrap/mallocwrap.c b/libmallocwrap/mallocwrap.c index d505b677..be1f39ed 100644 --- a/libmallocwrap/mallocwrap.c +++ b/libmallocwrap/mallocwrap.c @@ -20,7 +20,7 @@ #include #include -#include "marker.h" +#include #if 0 INTERCEPT_PROTOTYPE(void, malloc, size_t size) diff --git a/libust/Makefile.am b/libust/Makefile.am index 6cd09165..a8986f2f 100644 --- a/libust/Makefile.am +++ b/libust/Makefile.am @@ -1,9 +1,7 @@ -INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libustcomm +AM_CPPFLAGS = -I$(top_builddir)/share -I$(top_builddir)/libustcomm -I$(top_builddir)/include lib_LTLIBRARIES = libust.la -libust_la_SOURCES = buffer.h marker.c marker.h tracepoint.c tracepoint.h immediate.h channels.c channels.h marker-control.c marker-control.h relay.c relay.h tracer.c tracer.h tracercore.c tracercore.h serialize.c tracectl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/share/usterr.h +libust_la_SOURCES = buffer.h marker.c tracepoint.c channels.c channels.h marker-control.c marker-control.h relay.c relay.h tracer.c tracer.h tracercore.c tracercore.h serialize.c tracectl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/share/usterr.h libust_la_LDFLAGS = -no-undefined -version-info 0:0:0 libust_la_LIBADD = -lpthread libust_la_CFLAGS = -DUST_COMPONENT="libust" - -include_HEADERS = marker.h tracepoint.h immediate.h diff --git a/libust/channels.c b/libust/channels.c index 10ab587c..a4f4af10 100644 --- a/libust/channels.c +++ b/libust/channels.c @@ -31,7 +31,7 @@ #include "kernelcompat.h" #include "channels.h" #include "usterr.h" -#include "marker.h" +#include /* * ltt_channel_mutex may be nested inside the LTT trace mutex. diff --git a/libust/marker.c b/libust/marker.c index ff01f42e..cebf07dd 100644 --- a/libust/marker.c +++ b/libust/marker.c @@ -35,7 +35,7 @@ #include "kernelcompat.h" -#include "marker.h" +#include #include "usterr.h" #include "channels.h" #include "tracercore.h" diff --git a/libust/tracectl.c b/libust/tracectl.c index 8cb44f80..3d3bd485 100644 --- a/libust/tracectl.c +++ b/libust/tracectl.c @@ -29,7 +29,7 @@ #include -#include "marker.h" +#include #include "tracer.h" #include "usterr.h" #include "ustcomm.h" diff --git a/libust/tracepoint.c b/libust/tracepoint.c index df94b2cb..9de21c88 100644 --- a/libust/tracepoint.c +++ b/libust/tracepoint.c @@ -33,7 +33,7 @@ #include #include "kernelcompat.h" -#include "tracepoint.h" +#include #include "usterr.h" //#include "list.h" diff --git a/libust/tracer.h b/libust/tracer.h index 601d19a7..9275fd0d 100644 --- a/libust/tracer.h +++ b/libust/tracer.h @@ -32,7 +32,7 @@ #include "relay.h" #include "channels.h" #include "tracercore.h" -#include "marker.h" +#include /* Number of bytes to log with a read/write event */ #define LTT_LOG_RW_SIZE 32L diff --git a/tests/basic/Makefile.am b/tests/basic/Makefile.am index 669cb826..bfb77fcd 100644 --- a/tests/basic/Makefile.am +++ b/tests/basic/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust +INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/include noinst_PROGRAMS = basic basic_SOURCES = basic.c diff --git a/tests/basic/basic.c b/tests/basic/basic.c index a5ceff36..c1fa8069 100644 --- a/tests/basic/basic.c +++ b/tests/basic/basic.c @@ -1,8 +1,7 @@ #include #include -#include "marker.h" - +#include int main() { diff --git a/tests/basic_long/Makefile.am b/tests/basic_long/Makefile.am index a6e0f7c5..867ac837 100644 --- a/tests/basic_long/Makefile.am +++ b/tests/basic_long/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust +INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/include noinst_PROGRAMS = basic_long basic_long_SOURCES = basic_long.c diff --git a/tests/basic_long/basic_long.c b/tests/basic_long/basic_long.c index 29f26ef9..803d7ea6 100644 --- a/tests/basic_long/basic_long.c +++ b/tests/basic_long/basic_long.c @@ -1,8 +1,7 @@ #include #include -#include "marker.h" - +#include int main() { diff --git a/tests/fork/Makefile.am b/tests/fork/Makefile.am index 86a1a798..4e2baf89 100644 --- a/tests/fork/Makefile.am +++ b/tests/fork/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust +INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/include noinst_PROGRAMS = fork fork2 fork_SOURCES = fork.c diff --git a/tests/fork/fork.c b/tests/fork/fork.c index 677261b1..241ef812 100644 --- a/tests/fork/fork.c +++ b/tests/fork/fork.c @@ -2,8 +2,7 @@ #include #include -#include "marker.h" - +#include int main(int argc, char **argv, char *env[]) { diff --git a/tests/fork/fork2.c b/tests/fork/fork2.c index 7d0dda7d..63659c47 100644 --- a/tests/fork/fork2.c +++ b/tests/fork/fork2.c @@ -1,7 +1,7 @@ #include #include -#include "marker.h" +#include int main() { diff --git a/tests/hello/Makefile.am b/tests/hello/Makefile.am index bef643db..e6b33857 100644 --- a/tests/hello/Makefile.am +++ b/tests/hello/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust +INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/include noinst_PROGRAMS = hello hello_SOURCES = hello.c tp.c tp.h diff --git a/tests/hello/hello.c b/tests/hello/hello.c index 0417f1e9..dc220c46 100644 --- a/tests/hello/hello.c +++ b/tests/hello/hello.c @@ -7,11 +7,7 @@ #include #include -#include "marker.h" -#include "usterr.h" -#include "tracer.h" -#include "marker-control.h" -#include "relay.h" +#include #include "tp.h" diff --git a/tests/hello/tp.c b/tests/hello/tp.c index 2ee7392b..e3d67618 100644 --- a/tests/hello/tp.c +++ b/tests/hello/tp.c @@ -1,5 +1,5 @@ #include "tp.h" -#include "marker.h" +#include #include "usterr.h" DEFINE_TRACE(hello_tptest); diff --git a/tests/hello/tp.h b/tests/hello/tp.h index 6064283b..ea401e11 100644 --- a/tests/hello/tp.h +++ b/tests/hello/tp.h @@ -1,4 +1,4 @@ -#include "tracepoint.h" +#include DECLARE_TRACE(hello_tptest, TPPROTO(int anint), diff --git a/tests/hello2/Makefile.am b/tests/hello2/Makefile.am index 8c3aad1e..85cfd2b8 100644 --- a/tests/hello2/Makefile.am +++ b/tests/hello2/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust +INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/include noinst_PROGRAMS = hello2 hello2_SOURCES = hello2.c diff --git a/tests/hello2/hello2.c b/tests/hello2/hello2.c index bd3856cb..17e478cf 100644 --- a/tests/hello2/hello2.c +++ b/tests/hello2/hello2.c @@ -2,7 +2,8 @@ #include #include -#include "marker.h" +#include + int main() { int i; diff --git a/ustd/Makefile.am b/ustd/Makefile.am index df49a820..e8fa272b 100644 --- a/ustd/Makefile.am +++ b/ustd/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust \ - -I$(top_builddir)/libustcomm +AM_CPPFLAGS = -I$(top_builddir)/share -I$(top_builddir)/libust \ + -I$(top_builddir)/libustcomm -I$(top_builddir)/include bin_PROGRAMS = ustd ustd_SOURCES = lowlevel.c ustd.c ustd.h $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/share/usterr.h -- 2.34.1