X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=Makefile.am;h=b9cc1e7d1637977d40d97d36adc71ea9ecdd46e5;hb=b5a3dfa5923801ddeea22ce70758d1e61200eac2;hp=cd81be0e3f42363a4e629efef1e45e61e2aa4bbc;hpb=c5a7fbbd654a42b2e9addea9ab035073e5d7a5fd;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index cd81be0e..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_srcdir)/include -o $@ $<
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc