X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=e231e085d9dfdb4e7a76ea2d50a5418262ea107e;hb=9d36f30e825135d8fbb3ba6cb31ab10aa938b135;hp=b72f9faf7b4bce709db658c4f475bcf1ffa1f681;hpb=8d8a24c8565ce6dce7e7bd1045a95d1d2af5e536;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index b72f9faf..e231e085 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,29 +1,22 @@
 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 libringbuffer libust include doc tests
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		liblttng-ust-libc-wrapper \
+		tools \
+		tests \
+		doc
+
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java
+endif
 
 #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 $@ $<
+# liblttng-ust-malloc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ust.pc
+pkgconfig_DATA = lttng-ust.pc
+
+dist_doc_DATA = README ChangeLog