# 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 libustd 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
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 -o $@ $<
+ $(CC) $(CFLAGS) -fno-strict-aliasing -fPIC -c -I$(top_srcdir)/include -I$(top_srcdir) -o $@ $<
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ust.pc