X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=Makefile.am;h=c726b81696e26deedb923a2e176a6cde0bfd2f5d;hb=refs%2Fheads%2Fstable-2.0;hp=de22e0d84021d2aedff6300ab3a1fc9024f5d40f;hpb=bf0d695d692163edb23b8fbbbd976387dfef232d;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index de22e0d8..c726b816 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,23 @@
-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 libust . tests libmallocwrap ustd ustctl libinterfork include
+SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		liblttng-ust-libc-wrapper \
+		tools \
+		tests \
+		doc
 
-EXTRA_DIST = doc libust.ldscript.in libust-initializer.c
-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) -fPIC -c -I$(top_srcdir)/include -o $@ $<
+dist_doc_DATA = README ChangeLog