Update version to 0.16

[ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1bdedea2118f695c470d052f51b8d7bccfc76532..bff619836298e38d90aaec245f36d2f19a488a4e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,27 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork include
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = doc
+# 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 $(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
\ No newline at end of file