X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=6957f07de11c00c278f30e66f8f007b677457ddd;hb=dc6c486b9ac1c9db99050f9d9d1919f9cb651027;hp=2d6c23b6653f64c2b470dfaaa8566b85cc82247c;hpb=01377ba5ec3460a6886f3a16e52f7f956c8fb100;p=ust.git

diff --git a/Makefile.am b/Makefile.am
index 2d6c23b..6957f07 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,24 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ust libinterfork
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = share/kernelcompat.h doc
-bin_SCRIPTS = usttrace
+# 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 = snprintf libustcomm libustctl libust . tests libustinstr-malloc libustconsumer ust-consumerd ustctl libustfork include doc
+
+EXTRA_DIST = libust.ldscript.in libust-initializer.c libust-initializer.h
+dist_bin_SCRIPTS = usttrace
+
+ldscriptsdir = $(libdir)
+ldscripts_DATA = libust.so libust-initializer.o
+
+CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
+
+libust.so: libust.ldscript.in
+	$(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) -fno-strict-aliasing -fPIC -c -I$(top_srcdir)/include -I$(top_srcdir) -o $@ $<