Rename sessiond comm lib into ust comm

[lttng-ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1ab59487cc26af608819e12ee2fe1e3a3a7ca2f6..4f5ae8c1876cbfa2ac9f05d7cb0dc7c755c8a2c6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,29 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork include
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = doc share/kernelcompat.h share/share.h share/usterr.h
-dist_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 liblttng-ust-comm libringbuffer libust include doc tests
 
-include_HEADERS = share/kernelcompat.h share/usterr.h
+#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