X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2FMakefile.am;h=f04512201d40db75b5845a81ef9cbdcf84661dbb;hp=72fa2761e2b560c5508c9b4e593b4eb0300ab9d4;hb=ce4923b0c7a2de36eba95725334d251e9aa08aad;hpb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3

diff --git a/include/Makefile.am b/include/Makefile.am
index 72fa2761..f0451220 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -6,6 +6,8 @@ babeltrace2include_HEADERS = \
 	babeltrace2/error-cause-const.h \
 	babeltrace2/error-const.h \
 	babeltrace2/func-status.h \
+	babeltrace2/integer-range-set-const.h \
+	babeltrace2/integer-range-set.h \
 	babeltrace2/logging.h \
 	babeltrace2/property.h \
 	babeltrace2/types.h \
@@ -14,43 +16,24 @@ babeltrace2include_HEADERS = \
 	babeltrace2/value.h \
 	babeltrace2/version.h
 
-# Legacy API (for CTF writer)
-babeltrace2ctfincludedir = "$(includedir)/babeltrace2/ctf"
-babeltrace2ctfinclude_HEADERS = \
-	babeltrace2/ctf/events.h
-
 # CTF writer API
-babeltrace2ctfwriterincludedir = "$(includedir)/babeltrace2/ctf-writer"
+babeltrace2ctfwriterincludedir = "$(includedir)/babeltrace2-ctf-writer"
 babeltrace2ctfwriterinclude_HEADERS = \
-	babeltrace2/ctf-writer/clock-class.h \
-	babeltrace2/ctf-writer/clock.h \
-	babeltrace2/ctf-writer/event-fields.h \
-	babeltrace2/ctf-writer/event-types.h \
-	babeltrace2/ctf-writer/event.h \
-	babeltrace2/ctf-writer/field-types.h \
-	babeltrace2/ctf-writer/fields.h \
-	babeltrace2/ctf-writer/object.h \
-	babeltrace2/ctf-writer/stream-class.h \
-	babeltrace2/ctf-writer/stream.h \
-	babeltrace2/ctf-writer/trace.h \
-	babeltrace2/ctf-writer/types.h \
-	babeltrace2/ctf-writer/utils.h \
-	babeltrace2/ctf-writer/visitor.h \
-	babeltrace2/ctf-writer/writer.h
-
-# Legacy API (for CTF writer)
-babeltrace2ctfirincludedir = "$(includedir)/babeltrace2/ctf-ir"
-babeltrace2ctfirinclude_HEADERS = \
-	babeltrace2/ctf-ir/clock.h \
-	babeltrace2/ctf-ir/event-fields.h \
-	babeltrace2/ctf-ir/event-types.h \
-	babeltrace2/ctf-ir/event.h \
-	babeltrace2/ctf-ir/field-types.h \
-	babeltrace2/ctf-ir/fields.h \
-	babeltrace2/ctf-ir/stream-class.h \
-	babeltrace2/ctf-ir/stream.h \
-	babeltrace2/ctf-ir/trace.h \
-	babeltrace2/ctf-ir/utils.h
+	babeltrace2-ctf-writer/clock-class.h \
+	babeltrace2-ctf-writer/clock.h \
+	babeltrace2-ctf-writer/event-fields.h \
+	babeltrace2-ctf-writer/event-types.h \
+	babeltrace2-ctf-writer/event.h \
+	babeltrace2-ctf-writer/field-types.h \
+	babeltrace2-ctf-writer/fields.h \
+	babeltrace2-ctf-writer/object.h \
+	babeltrace2-ctf-writer/stream-class.h \
+	babeltrace2-ctf-writer/stream.h \
+	babeltrace2-ctf-writer/trace.h \
+	babeltrace2-ctf-writer/types.h \
+	babeltrace2-ctf-writer/utils.h \
+	babeltrace2-ctf-writer/visitor.h \
+	babeltrace2-ctf-writer/writer.h
 
 # Trace IR API
 babeltrace2traceirincludedir = "$(includedir)/babeltrace2/trace-ir"