X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=d6fa3d51e1dd7bf7066be7e4532a09e79b4feccf;hb=06b47e5e40502d2847fbdeefdb32dd3cb4a32886;hp=e2d131a8ac592e90c242c3cbd6b04b4952343909;hpb=e8300fb7111bd3686d8b863db0c661ae491ee6ae;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index e2d131a8..d6fa3d51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,17 @@
-ACLOCAL_AMFLAGS = -I m4
+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 libustcomm libust . tests libmallocwrap ustd ustctl libustfork include
+SUBDIRS = . include doc snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		tests
 
-EXTRA_DIST = doc libust.ldscript.in libust-initializer.c
-dist_bin_SCRIPTS = usttrace
+if BUILD_JNI_INTERFACE
+SUBDIRS += liblttng-ust-java
+endif
 
-ldscriptsdir = $(libdir)
-ldscripts_DATA = libust.so libust-initializer.o
+#temporarily disabled
+# liblttng-ust-malloc
 
-CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
-
-libust.so: libust.ldscript.in
-	$(SED) -e "s@\@FORMAT\@@$(LIBFORMAT)@" < $< > $@
-
-# 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) -fPIC -c -I$(top_srcdir)/include -o $@ $<
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc