From c93858f1db9c8fedb9cb3dc751c95ce77083c7ee Mon Sep 17 00:00:00 2001
From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Wed, 11 Nov 2009 16:47:06 -0500
Subject: [PATCH] revert installation of tracer.h, but keep ust.h

---
 include/Makefile.am              | 2 +-
 include/ust/ust.h                | 1 -
 libust/Makefile.am               | 2 +-
 libust/marker-control.c          | 2 +-
 libust/marker.c                  | 2 +-
 libust/relay.c                   | 2 +-
 libust/serialize.c               | 2 +-
 libust/tracectl.c                | 2 +-
 libust/tracer.c                  | 2 +-
 {include/ust => libust}/tracer.h | 0
 ustd/lowlevel.c                  | 2 +-
 11 files changed, 9 insertions(+), 10 deletions(-)
 rename {include/ust => libust}/tracer.h (100%)

diff --git a/include/Makefile.am b/include/Makefile.am
index 38973bea..3f6ca1e1 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,4 @@
 nobase_include_HEADERS = ust/immediate.h ust/kernelcompat.h ust/marker.h \
-	ust/tracepoint.h ust/processor.h ust/tracer.h ust/ust.h
+	ust/tracepoint.h ust/processor.h ust/ust.h
 
 noinst_HEADERS = share.h usterr.h
diff --git a/include/ust/ust.h b/include/ust/ust.h
index 158805c5..df2a7aee 100644
--- a/include/ust/ust.h
+++ b/include/ust/ust.h
@@ -7,6 +7,5 @@
 #include <ust/marker.h>
 #include <ust/processor.h>
 #include <ust/tracepoint.h>
-#include <ust/tracer.h>
 
 #endif /* UST_H */
diff --git a/libust/Makefile.am b/libust/Makefile.am
index e23b5c94..6d99d0d5 100644
--- a/libust/Makefile.am
+++ b/libust/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/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 tracercore.c tracercore.h serialize.c tracectl.c $(top_builddir)/libustcomm/ustcomm.c
+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/marker-control.c b/libust/marker-control.c
index e88f001a..a0786bad 100644
--- a/libust/marker-control.c
+++ b/libust/marker-control.c
@@ -35,7 +35,7 @@
 
 #include <ust/kernelcompat.h>
 //#include "list.h"
-#include <ust/tracer.h>
+#include "tracer.h"
 #include "usterr.h"
 
 #define DEFAULT_CHANNEL "cpu"
diff --git a/libust/marker.c b/libust/marker.c
index 146fbc9d..47b6d11f 100644
--- a/libust/marker.c
+++ b/libust/marker.c
@@ -36,10 +36,10 @@
 #include <ust/kernelcompat.h>
 
 #include <ust/marker.h>
-#include <ust/tracer.h>
 #include "usterr.h"
 #include "channels.h"
 #include "tracercore.h"
+#include "tracer.h"
 
 __thread long ust_reg_stack[500];
 volatile __thread long *ust_reg_stack_ptr = (long *) 0;
diff --git a/libust/relay.c b/libust/relay.c
index b6a2181a..408ce906 100644
--- a/libust/relay.c
+++ b/libust/relay.c
@@ -31,7 +31,7 @@
 #include "relay.h"
 #include "channels.h"
 #include <kcompat/kref.h>
-#include <ust/tracer.h>
+#include "tracer.h"
 #include "tracercore.h"
 #include "usterr.h"
 
diff --git a/libust/serialize.c b/libust/serialize.c
index ee8b8284..b1859ed9 100644
--- a/libust/serialize.c
+++ b/libust/serialize.c
@@ -39,7 +39,7 @@
 #include <urcu/rculist.h>
 
 #include "relay.h"
-#include <ust/tracer.h>
+#include "tracer.h"
 //#include "list.h"
 #include "usterr.h"
 
diff --git a/libust/tracectl.c b/libust/tracectl.c
index 6fb089d2..e28b3159 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -30,7 +30,7 @@
 #include <urcu-bp.h>
 
 #include <ust/marker.h>
-#include <ust/tracer.h>
+#include "tracer.h"
 #include "usterr.h"
 #include "ustcomm.h"
 #include "relay.h" /* FIXME: remove */
diff --git a/libust/tracer.c b/libust/tracer.c
index ce3bfd01..a3ace72c 100644
--- a/libust/tracer.c
+++ b/libust/tracer.c
@@ -55,8 +55,8 @@
 #include <urcu/rculist.h>
 
 #include <ust/kernelcompat.h>
-#include <ust/tracer.h>
 #include "tracercore.h"
+#include "tracer.h"
 #include "usterr.h"
 
 //ust// static void async_wakeup(unsigned long data);
diff --git a/include/ust/tracer.h b/libust/tracer.h
similarity index 100%
rename from include/ust/tracer.h
rename to libust/tracer.h
diff --git a/ustd/lowlevel.c b/ustd/lowlevel.c
index dbe03c1d..6a91accb 100644
--- a/ustd/lowlevel.c
+++ b/ustd/lowlevel.c
@@ -17,7 +17,7 @@
 
 #include <assert.h>
 
-#include <ust/tracer.h>
+#include "tracer.h"
 #include "ustd.h"
 #include "usterr.h"
 
-- 
2.34.1