X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=e2d131a8ac592e90c242c3cbd6b04b4952343909;hb=e8300fb7111bd3686d8b863db0c661ae491ee6ae;hp=be14587eeb2f130ec1ee9f027462e949daa186ac;hpb=89edbbc3ab8ae58e3c6d9c47e7a123f1514d0338;p=ust.git

diff --git a/Makefile.am b/Makefile.am
index be14587..e2d131a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4
 # libust and '.' (that contains the linker script). However, '.'
 # must be installed after libust so it can overwrite libust.so with
 # the linker script.
-SUBDIRS = libust . tests libmallocwrap ustd ustctl libinterfork include
+SUBDIRS = snprintf libustcomm libust . tests libmallocwrap ustd ustctl libustfork include
 
 EXTRA_DIST = doc libust.ldscript.in libust-initializer.c
 dist_bin_SCRIPTS = usttrace
@@ -16,7 +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)@" -e "s@\@PATH\@@${libdir}@g" < $< > $@
+	$(SED) -e "s@\@FORMAT\@@$(LIBFORMAT)@" < $< > $@
 
+# 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) -c -I$(top_srcdir)/include -o $@ $<
+	$(CC) $(CFLAGS) -fPIC -c -I$(top_srcdir)/include -o $@ $<