Make dist fixes

opencl/Makefile.am

@@ -218,6 +218,7 @@ EXTRA_DIST = \
 	dust.c.erb \
 	gen_clprof.rb \
 	clinterval_callbacks.cpp.erb \
+	clinterval_callbacks.hpp \
 	babeltrace_opencl.in \
 	extract_enqueues \
 	test_wrapper.sh 

utils/Makefile.am

-noinst_HEADERS = lttng/tracepoint.h utarray.h uthash.h utlist.h
-nodist_noinst_HEADERS = lttng/tracepoint_gen.h xprof.sh.erb
+noinst_HEADERS = lttng/tracepoint.h utarray.h uthash.h utlist.h xprof_utils.hpp
+nodist_noinst_HEADERS = lttng/tracepoint_gen.h
 
 lttng/tracepoint_gen.h: $(srcdir)/tracepoint_gen.rb
 	mkdir -p lttng
 	$(RUBY) $(srcdir)/tracepoint_gen.rb 25 > lttng/tracepoint_gen.h
 
 CLEANFILES = lttng/tracepoint_gen.h
-EXTRA_DIST = LTTng.rb tracepoint_gen.rb yaml_ast.rb xprof_utils.h.erb
+EXTRA_DIST = LTTng.rb tracepoint_gen.rb yaml_ast.rb xprof_utils.cpp

xprof/Makefile.am

 .DELETE_ON_ERROR:
 
-# I put tally_utils.h to force the generation
-# It seem to me that this is an ugly hack...
-
-BUILT_SOURCES = xprof.c tally_utils.hpp
-
 bin_SCRIPTS = iprof
 
 iprof: $(top_builddir)/utils/xprof.sh.erb
@@ -28,6 +23,7 @@ libXProf_la_SOURCES = \
 	tally.hpp \
 	tally.h \
 	tally.cpp \
+	tally_utils.hpp \
 	timeline.hpp \
 	timeline.h \
 	timeline.cpp 
@@ -48,7 +44,9 @@ install-data-hook:
 	$(RM) -r $(DESTDIR)$(tmplibdir)
 
 EXTRA_DIST = \
-	tally_utils.hpp.erb
+	tally_utils.hpp.erb \
+	interval.h.erb \
+    interval.c.erb 
 
 CLEANFILES = \
 	tally_utils.hpp

ze/Makefile.am

@@ -280,7 +280,10 @@ babeltrace_ze_dispatchers.c: $(srcdir)/gen_babeltrace_ze_dispatchers.rb $(ZE_LIB
 
 EXTRA_DIST += \
 	gen_babeltrace_ze_callbacks.rb \
-	gen_babeltrace_ze_dispatchers.rb
+	gen_babeltrace_ze_dispatchers.rb \
+	gen_zeprof.rb \
+	zeinterval_callbacks.cpp.erb  \
+	zeinterval_callbacks.hpp 
 
 CLEANFILES += \
 	babeltrace_ze_callbacks.h \