X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=Makefile.am;h=79ff75359e62eb7991cb4d701c715f03c0186041;hb=74d89c32c1f8928943e1ce7eae5d659d4fd601a9;hp=249bf026d5cad0f4deb282f937f41a16a42759ab;hpb=9dc7b7ff797a5cbb1e9ffd59e053a04562f306c4;p=lttng-ust.git

diff --git a/Makefile.am b/Makefile.am
index 249bf026..79ff7535 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,10 +5,13 @@ ACLOCAL_AMFLAGS = -I config
 # 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 libustcmd libust . tests libustinstr-malloc libustconsumer ust-consumerd ustctl libustfork include doc
+SUBDIRS = snprintf liblttng-ust-comm libringbuffer libust include doc tests \
+		libustjava
+
+#temporarily disabled
+# . libustinstr-malloc libustfork
 
 EXTRA_DIST = libust.ldscript.in libust-initializer.c libust-initializer.h
-dist_bin_SCRIPTS = usttrace
 
 ldscriptsdir = $(libdir)
 ldscripts_DATA = libust.so libust-initializer.o
@@ -16,9 +19,12 @@ ldscripts_DATA = libust.so libust-initializer.o
 CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
 
 libust.so: libust.ldscript.in
-	$(SED) -e "s@\@FORMAT\@@$(LIBFORMAT)@" < $< > $@
+	$(SED) -e $(if $(LIBFORMAT),"s@\@FORMAT\@@$(LIBFORMAT)@","s@.*\@FORMAT\@.*@@") < $< > $@
 
 # 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 $@ $<
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc