Merge branch 'master' into 'modularize'

Master

See merge request !11

utils/xprof.sh.erb.in

@@ -160,10 +160,10 @@ summary() {
     if [[ "$trace" ]] ; then
         # Todo filter direcly in the babeltrace
 <% if languages.include?("opencl") %>
-        $bindir/babeltrace_opencl $lttng_last_session | grep lttng_ust_opencl
+        $bindir/babeltrace_opencl $lttng_last_session | grep --binary-files=text lttng_ust_opencl
 <% end %>
 <% if languages.include?("ze") %>
-        $bindir/babeltrace_ze $lttng_last_session | grep lttng_ust_ze
+        $bindir/babeltrace_ze $lttng_last_session | grep --binary-files=text lttng_ust_ze
 <% end %>
     fi
     

ze/Makefile.am

@@ -317,7 +317,9 @@ ZE_BINDINGS = \
 	ze_refinements.rb \
 	ze_bindings.rb
 
-data_DATA = $(ZE_BINDINGS)
+data_DATA = \
+	$(ZE_BINDINGS) \
+	ze_bindings_base.rb
 
 EXTRA_DIST += \
 	gen_ze_library.rb \