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

diff --git a/Makefile.am b/Makefile.am
index be14587..5a7c03b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I config
 
 # The order here is tricky. SUBDIRS applies both to compilation and
 # installation. Programs depending on the libs must be built after
 # 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 libustinstr-malloc ustd ustctl libustfork include doc
 
-EXTRA_DIST = doc libust.ldscript.in libust-initializer.c
+EXTRA_DIST = libust.ldscript.in libust-initializer.c
 dist_bin_SCRIPTS = usttrace
 
 ldscriptsdir = $(libdir)
@@ -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) -fno-strict-aliasing -fPIC -c -I$(top_srcdir)/include -o $@ $<