X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=b9cc1e7d1637977d40d97d36adc71ea9ecdd46e5;hb=003fedf4968e55d8f7711faf784a37d2804c3a21;hp=05ea397ec600bedde4b880b8998601364171065a;hpb=43550d379ea53556183002632da0d23c0c417d03;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 05ea397e..b9cc1e7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,10 @@
-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 libustinstr-malloc ustd ustctl libustfork include doc
+SUBDIRS = . snprintf liblttng-ust-comm libringbuffer libust libustctl \
+		include doc libustjava libustfork tests
 
-EXTRA_DIST = libust.ldscript.in libust-initializer.c
-dist_bin_SCRIPTS = usttrace
+#temporarily disabled
+# . libustinstr-malloc
 
-ldscriptsdir = $(libdir)
-ldscripts_DATA = libust.so libust-initializer.o
-
-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 = ust.pc