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

diff --git a/Makefile.am b/Makefile.am
index 05ea397e..4f5ae8c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,16 @@
-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 include doc tests
 
-EXTRA_DIST = libust.ldscript.in libust-initializer.c
-dist_bin_SCRIPTS = usttrace
+#temporarily disabled
+# . libustinstr-malloc libustfork
+
+EXTRA_DIST = libust.ldscript.in libust-initializer.c libust-initializer.h
 
 ldscriptsdir = $(libdir)
 ldscripts_DATA = libust.so libust-initializer.o
@@ -16,9 +18,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) -fPIC -c -I$(top_srcdir)/include -o $@ $<
+	$(CC) $(CFLAGS) -fno-strict-aliasing -fPIC -c -I$(top_srcdir)/include -I$(top_srcdir) -o $@ $<
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc