X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=b163bf8996c6655be22bc442a00f53a3ae8ab50d;hb=67c5b804ac870bdc3b262c0cf6cbf117f3e6bc1e;hp=996aedd386fbe7fc5f0d14cf3fca4247e412f300;hpb=b4512257eb71d0432554047acf6278dc42a15a75;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 996aedd3..b163bf89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,29 @@
-SUBDIRS = libust hello libmallocwrap
+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 = snprintf liblttng-sessiond-comm libringbuffer libust include doc tests
+
+#temporarily disabled
+# . libustinstr-malloc libustfork
+
+EXTRA_DIST = libust.ldscript.in libust-initializer.c libust-initializer.h
+
+ldscriptsdir = $(libdir)
+ldscripts_DATA = libust.so libust-initializer.o
+
+CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
+
+libust.so: libust.ldscript.in
+	$(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 -I$(top_srcdir) -o $@ $<
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc