# 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 libustcomm libustctl libust . tests libustinstr-malloc libustconsumer ust-consumerd ustctl libustfork include doc
EXTRA_DIST = libust.ldscript.in libust-initializer.c libust-initializer.h
dist_bin_SCRIPTS = usttrace
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.