X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=Makefile.am;h=4f5ae8c1876cbfa2ac9f05d7cb0dc7c755c8a2c6;hb=a10cfdbdf6ed789bc14a04a883bffaf3df2b6959;hp=646b3d3026e5f9c999a15d3c2e8cc3e762628e2a;hpb=9441df61728a22747f28a713b6c00b1732acbd57;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 646b3d30..4f5ae8c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,29 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork include
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = doc libust.ldscript.in libust-initializer.c
-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
+
+#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)
+CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
 
 libust.so: libust.ldscript.in
-	$(SED) -e "s@\@FORMAT\@@$(LIBFORMAT)@" -e "s@\@PATH\@@${libdir}@g" < $< > $@
+	$(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) -c -I$(top_srcdir)/include -o $@ $<
+	$(CC) $(CFLAGS) -fno-strict-aliasing -fPIC -c -I$(top_srcdir)/include -I$(top_srcdir) -o $@ $<
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc