X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=9e165467764cbef86ca698c7b935fc7786ccb637;hb=9edd34bd25f52dd39b354a84f02697254121aefd;hp=c77ef8f03a74154197381465c688fe91d0b63b25;hpb=d6c9f207eca8cda2b30dd5d4a0a6816f25b1b796;p=ust.git

diff --git a/Makefile.am b/Makefile.am
index c77ef8f..9e16546 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 libustcmd 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)
@@ -16,9 +16,9 @@ ldscripts_DATA = libust.so libust-initializer.o
 CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
 
 libust.so: libust.ldscript.in
-	$(SED) -e "s@\@FORMAT\@@$(LIBFORMAT)@" < $< > $@
+	$(SED) -e $(if $(LIBFORMAT),"s@\@FORMAT\@@$(LIBFORMAT)@","s@.*\@FORMAT\@.*@@") < $< > $@
 
 # 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 $@ $<