X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=Makefile.am;h=c726b81696e26deedb923a2e176a6cde0bfd2f5d;hp=6957f07de11c00c278f30e66f8f007b677457ddd;hb=29865d1ccafc065d07e0de67b196790ed36ab396;hpb=2298f3297443ba26f761e272c45456ed857071bc

diff --git a/Makefile.am b/Makefile.am
index 6957f07d..c726b816 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,23 @@
 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 libustctl libust . tests libustinstr-malloc libustconsumer ust-consumerd ustctl libustfork include doc
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		liblttng-ust-libc-wrapper \
+		tools \
+		tests \
+		doc
 
-EXTRA_DIST = libust.ldscript.in libust-initializer.c libust-initializer.h
-dist_bin_SCRIPTS = usttrace
+#disabled for 2.0
+#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
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ust.pc
 
-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) -fno-strict-aliasing -fPIC -c -I$(top_srcdir)/include -I$(top_srcdir) -o $@ $<
+dist_doc_DATA = README ChangeLog