From fbca6b624335eef18c8d86194aeb101a720168f4 Mon Sep 17 00:00:00 2001 From: Jan Blunck Date: Sun, 25 Oct 2009 14:57:47 +0100 Subject: [PATCH] Move kernelcompat.h to include/ust/ and share.h, usterr.h to include/ kernelcompat.h is included by marker.h and tracepoint.h therefore it should be in include/ust/ as well. Move shared headers to include/ as well. Signed-off-by: Jan Blunck --- Makefile.am | 4 +--- include/Makefile.am | 5 ++++- {share => include}/share.h | 0 {share => include/ust}/kernelcompat.h | 0 include/ust/marker.h | 4 +--- include/ust/tracepoint.h | 2 +- {share => include}/usterr.h | 0 java/Makefile.am | 2 +- libinterfork/Makefile.am | 2 ++ libinterfork/interfork.c | 2 +- libmallocwrap/Makefile.am | 2 +- libust/Makefile.am | 4 ++-- libust/channels.c | 2 +- libust/channels.h | 2 +- libust/marker-control.c | 2 +- libust/marker.c | 2 +- libust/relay.c | 2 +- libust/serialize.c | 2 +- libust/tracepoint.c | 2 +- libust/tracer.c | 2 +- libust/tracer.h | 2 +- libust/tracercore.c | 2 +- libust/tracercore.h | 2 +- tests/basic/Makefile.am | 2 +- tests/basic_long/Makefile.am | 2 +- tests/fork/Makefile.am | 2 +- tests/hello/Makefile.am | 2 +- tests/hello/hello.c | 1 + tests/hello2/Makefile.am | 2 +- ustctl/Makefile.am | 9 ++++----- ustd/Makefile.am | 6 +++--- ustd/ustd.c | 1 - 32 files changed, 38 insertions(+), 38 deletions(-) rename {share => include}/share.h (100%) rename {share => include/ust}/kernelcompat.h (100%) rename {share => include}/usterr.h (100%) diff --git a/Makefile.am b/Makefile.am index 1ab59487..1bdedea2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork include -EXTRA_DIST = doc share/kernelcompat.h share/share.h share/usterr.h +EXTRA_DIST = doc dist_bin_SCRIPTS = usttrace - -include_HEADERS = share/kernelcompat.h share/usterr.h diff --git a/include/Makefile.am b/include/Makefile.am index 0a4f87da..48a898b6 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1 +1,4 @@ -nobase_include_HEADERS = ust/immediate.h ust/marker.h ust/tracepoint.h +nobase_include_HEADERS = ust/immediate.h ust/kernelcompat.h ust/marker.h \ + ust/tracepoint.h + +noinst_HEADERS = share.h usterr.h diff --git a/share/share.h b/include/share.h similarity index 100% rename from share/share.h rename to include/share.h diff --git a/share/kernelcompat.h b/include/ust/kernelcompat.h similarity index 100% rename from share/kernelcompat.h rename to include/ust/kernelcompat.h diff --git a/include/ust/marker.h b/include/ust/marker.h index cb2c46d9..2b5a0c38 100644 --- a/include/ust/marker.h +++ b/include/ust/marker.h @@ -28,9 +28,8 @@ //ust// #include #include //ust// #include -#include "kernelcompat.h" +#include #include -#include "usterr.h" //ust// struct module; //ust// struct task_struct; @@ -303,7 +302,6 @@ extern struct marker __stop___markers[] __attribute__((visibility("hidden"))); \ static void __attribute__((constructor)) __markers__init(void) \ { \ - DBG("next registration in "__FILE__"\n");\ marker_register_lib(__start___markers, (((long)__stop___markers)-((long)__start___markers))/sizeof(struct marker));\ } diff --git a/include/ust/tracepoint.h b/include/ust/tracepoint.h index 7cfdbb01..56c62b0c 100644 --- a/include/ust/tracepoint.h +++ b/include/ust/tracepoint.h @@ -32,7 +32,7 @@ #include #include -#include "kernelcompat.h" +#include struct module; struct tracepoint; diff --git a/share/usterr.h b/include/usterr.h similarity index 100% rename from share/usterr.h rename to include/usterr.h diff --git a/java/Makefile.am b/java/Makefile.am index f9deb7ac..fa536287 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust +AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/libust lib_LTLIBRARIES = libustjava.la libustjava_la_SOURCES = UST.c UST.h diff --git a/libinterfork/Makefile.am b/libinterfork/Makefile.am index 2bcebb11..6540103b 100644 --- a/libinterfork/Makefile.am +++ b/libinterfork/Makefile.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS = -I$(top_builddir)/include + lib_LTLIBRARIES = libinterfork.la libinterfork_la_SOURCES = interfork.c libinterfork_la_LIBADD = -ldl diff --git a/libinterfork/interfork.c b/libinterfork/interfork.c index 26a8bd6a..e9dce9bf 100644 --- a/libinterfork/interfork.c +++ b/libinterfork/interfork.c @@ -20,7 +20,7 @@ #include #include #include -#include "share/usterr.h" +#include "usterr.h" extern void ust_fork(void); extern void ust_potential_exec(void); diff --git a/libmallocwrap/Makefile.am b/libmallocwrap/Makefile.am index fa093071..23b7004e 100644 --- a/libmallocwrap/Makefile.am +++ b/libmallocwrap/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_builddir)/include lib_LTLIBRARIES = libmallocwrap.la libmallocwrap_la_SOURCES = mallocwrap.c diff --git a/libust/Makefile.am b/libust/Makefile.am index a8986f2f..9ee3c9a2 100644 --- a/libust/Makefile.am +++ b/libust/Makefile.am @@ -1,7 +1,7 @@ -AM_CPPFLAGS = -I$(top_builddir)/share -I$(top_builddir)/libustcomm -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/libustcomm lib_LTLIBRARIES = libust.la -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_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 libust_la_LDFLAGS = -no-undefined -version-info 0:0:0 libust_la_LIBADD = -lpthread libust_la_CFLAGS = -DUST_COMPONENT="libust" diff --git a/libust/channels.c b/libust/channels.c index a4f4af10..27ceefc6 100644 --- a/libust/channels.c +++ b/libust/channels.c @@ -28,7 +28,7 @@ //ust// #include //ust// #include -#include "kernelcompat.h" +#include #include "channels.h" #include "usterr.h" #include diff --git a/libust/channels.h b/libust/channels.h index c91874b5..e460e12b 100644 --- a/libust/channels.h +++ b/libust/channels.h @@ -26,7 +26,7 @@ //ust// #include #include -#include "kernelcompat.h" +#include #include #define EVENTS_PER_CHANNEL 65536 diff --git a/libust/marker-control.c b/libust/marker-control.c index c874c946..a0786bad 100644 --- a/libust/marker-control.c +++ b/libust/marker-control.c @@ -33,7 +33,7 @@ //ust// #include #include -#include "kernelcompat.h" +#include //#include "list.h" #include "tracer.h" #include "usterr.h" diff --git a/libust/marker.c b/libust/marker.c index cebf07dd..8690d2b1 100644 --- a/libust/marker.c +++ b/libust/marker.c @@ -33,7 +33,7 @@ #define _LGPL_SOURCE #include -#include "kernelcompat.h" +#include #include #include "usterr.h" diff --git a/libust/relay.c b/libust/relay.c index 0326adc1..408ce906 100644 --- a/libust/relay.c +++ b/libust/relay.c @@ -22,7 +22,7 @@ //ust// #include //ust// #include //ust// #include -#include "kernelcompat.h" +#include #include #include #include diff --git a/libust/serialize.c b/libust/serialize.c index 0055d994..99d4dce4 100644 --- a/libust/serialize.c +++ b/libust/serialize.c @@ -32,7 +32,7 @@ #include #include -#include "kernelcompat.h" +#include #define _LGPL_SOURCE #include #include diff --git a/libust/tracepoint.c b/libust/tracepoint.c index 9de21c88..cc2adf15 100644 --- a/libust/tracepoint.c +++ b/libust/tracepoint.c @@ -32,7 +32,7 @@ #include -#include "kernelcompat.h" +#include #include #include "usterr.h" //#include "list.h" diff --git a/libust/tracer.c b/libust/tracer.c index 4150551a..a3ace72c 100644 --- a/libust/tracer.c +++ b/libust/tracer.c @@ -54,7 +54,7 @@ //ust// #include #include -#include "kernelcompat.h" +#include #include "tracercore.h" #include "tracer.h" #include "usterr.h" diff --git a/libust/tracer.h b/libust/tracer.h index 9275fd0d..cb84dad7 100644 --- a/libust/tracer.h +++ b/libust/tracer.h @@ -27,7 +27,7 @@ #include #include //#include "list.h" -#include "kernelcompat.h" +#include #include "buffer.h" #include "relay.h" #include "channels.h" diff --git a/libust/tracercore.c b/libust/tracercore.c index 90adee45..652de1b1 100644 --- a/libust/tracercore.c +++ b/libust/tracercore.c @@ -22,7 +22,7 @@ //ust// #include //ust// #include //ust// #include -#include "kernelcompat.h" +#include #include "tracercore.h" /* Traces structures */ diff --git a/libust/tracercore.h b/libust/tracercore.h index 8dfffa13..5a088db6 100644 --- a/libust/tracercore.h +++ b/libust/tracercore.h @@ -21,7 +21,7 @@ #ifndef LTT_CORE_H #define LTT_CORE_H -#include "kernelcompat.h" +#include //ust// #include /* ltt's root dir in debugfs */ diff --git a/tests/basic/Makefile.am b/tests/basic/Makefile.am index bfb77fcd..4945cdf1 100644 --- a/tests/basic/Makefile.am +++ b/tests/basic/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_builddir)/include noinst_PROGRAMS = basic basic_SOURCES = basic.c diff --git a/tests/basic_long/Makefile.am b/tests/basic_long/Makefile.am index 867ac837..00b5ec61 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)/include +AM_CPPFLAGS = -I$(top_builddir)/include noinst_PROGRAMS = basic_long basic_long_SOURCES = basic_long.c diff --git a/tests/fork/Makefile.am b/tests/fork/Makefile.am index 4e2baf89..7bbef71d 100644 --- a/tests/fork/Makefile.am +++ b/tests/fork/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_builddir)/include noinst_PROGRAMS = fork fork2 fork_SOURCES = fork.c diff --git a/tests/hello/Makefile.am b/tests/hello/Makefile.am index e6b33857..ce0ad2fe 100644 --- a/tests/hello/Makefile.am +++ b/tests/hello/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/include +AM_CPPFLAGS = -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 dc220c46..c48b6df5 100644 --- a/tests/hello/hello.c +++ b/tests/hello/hello.c @@ -8,6 +8,7 @@ #include #include +#include "usterr.h" #include "tp.h" diff --git a/tests/hello2/Makefile.am b/tests/hello2/Makefile.am index 85cfd2b8..e06d5059 100644 --- a/tests/hello2/Makefile.am +++ b/tests/hello2/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_builddir)/include noinst_PROGRAMS = hello2 hello2_SOURCES = hello2.c diff --git a/ustctl/Makefile.am b/ustctl/Makefile.am index a27880a0..93c5629c 100644 --- a/ustctl/Makefile.am +++ b/ustctl/Makefile.am @@ -1,8 +1,7 @@ +AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/libustcomm \ + -I$(top_builddir)/libustcmd $(KCOMPAT_CFLAGS) + bin_PROGRAMS = ustctl -ustctl_SOURCES = ustctl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/libustcmd/ustcmd.c $(top_builddir)/libustcmd/ustcmd.h $(top_builddir)/share/usterr.h +ustctl_SOURCES = ustctl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/libustcmd/ustcmd.c $(top_builddir)/libustcmd/ustcmd.h ustctl_CFLAGS = -DUST_COMPONENT=ustctl -INCLUDES = $(KCOMPAT_CFLAGS) -INCLUDES += -I$(top_builddir)/libustcomm -INCLUDES += -I$(top_builddir)/libustcmd -INCLUDES += -I$(top_builddir)/share diff --git a/ustd/Makefile.am b/ustd/Makefile.am index e8fa272b..8c8fe647 100644 --- a/ustd/Makefile.am +++ b/ustd/Makefile.am @@ -1,7 +1,7 @@ -AM_CPPFLAGS = -I$(top_builddir)/share -I$(top_builddir)/libust \ - -I$(top_builddir)/libustcomm -I$(top_builddir)/include +AM_CPPFLAGS = -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 +ustd_SOURCES = lowlevel.c ustd.c ustd.h $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h ustd_LDFLAGS = -lpthread ustd_CFLAGS = -DUST_COMPONENT=ustd diff --git a/ustd/ustd.c b/ustd/ustd.c index fef0eae1..0026c3b1 100644 --- a/ustd/ustd.c +++ b/ustd/ustd.c @@ -35,7 +35,6 @@ #include "ustd.h" #include "usterr.h" #include "ustcomm.h" -#include "share.h" /* return value: 0 = subbuffer is finished, it won't produce data anymore * 1 = got subbuffer successfully -- 2.34.1