X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=6957f07de11c00c278f30e66f8f007b677457ddd;hb=94a809b8e7f2d5aaa2cecf6f9563b43dddc57252;hp=eb0c1b5dade6ca3bd6933e3f553a6239ac11eb02;hpb=d159ac37826eaebf4c1d87b8db0c5e5a8ccc0b00;p=ust.git

diff --git a/Makefile.am b/Makefile.am
index eb0c1b5..6957f07 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,9 @@ ACLOCAL_AMFLAGS = -I config
 # libust and '.' (that contains the linker script). However, '.'
 # must be installed after libust so it can overwrite libust.so with
 # the linker script.
-SUBDIRS = snprintf libustcomm libust . tests libustinstr-malloc libustd ustd ustctl libustfork include doc
+SUBDIRS = snprintf libustcomm libustctl libust . tests libustinstr-malloc libustconsumer ust-consumerd ustctl libustfork include doc
 
-EXTRA_DIST = libust.ldscript.in libust-initializer.c
+EXTRA_DIST = libust.ldscript.in libust-initializer.c libust-initializer.h
 dist_bin_SCRIPTS = usttrace
 
 ldscriptsdir = $(libdir)
@@ -21,4 +21,4 @@ libust.so: libust.ldscript.in
 # It is very important to compile the initializer with PIC otherwise we
 # may get obscure errors when linking to shared libraries.
 libust-initializer.o: libust-initializer.c
-	$(CC) $(CFLAGS) -fno-strict-aliasing -fPIC -c -I$(top_srcdir)/include -o $@ $<
+	$(CC) $(CFLAGS) -fno-strict-aliasing -fPIC -c -I$(top_srcdir)/include -I$(top_srcdir) -o $@ $<