X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=b9cc1e7d1637977d40d97d36adc71ea9ecdd46e5;hb=003fedf4968e55d8f7711faf784a37d2804c3a21;hp=8c4eb65c677564754bf0652720e4505271ad393d;hpb=9727555f30daf958f4817b28069ad36e871d65e8;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 8c4eb65c..b9cc1e7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,10 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork include
+ACLOCAL_AMFLAGS = -I config
 
-EXTRA_DIST = doc libust.ldscript.in libust-initializer.c
-dist_bin_SCRIPTS = usttrace
+SUBDIRS = . snprintf liblttng-ust-comm libringbuffer libust libustctl \
+		include doc libustjava libustfork tests
 
-ldscriptsdir = $(libdir)
-ldscripts_DATA = libust.so libust-initializer.o
+#temporarily disabled
+# . libustinstr-malloc
 
-CLEANFILES = $(ldscripts_DATA)
-
-libust_FORMAT := $(shell case $(shell uname -m) in (i*86) echo elf32-i386 ;; (x86_64) echo elf64-x86-64 ;; (ppc) echo elf32-powerpc ;; (ppc64) echo elf64-powerpc ;; (s390) echo elf32-s390 ;; (s390x) echo elf64-s390 ;; esac)
-libust.so: libust.ldscript.in
-	$(SED) -e "s@\@FORMAT\@@${libust_FORMAT}@" -e "s@\@PATH\@@${libdir}@g" < $< > $@
-
-libust-initializer.o: libust-initializer.c
-	$(CC) $(CFLAGS) -c -I$(top_builddir)/include -o $@ $<
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc