use signal safe ust_safe_snprintf()

[ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index be14587eeb2f130ec1ee9f027462e949daa186ac..de22e0d84021d2aedff6300ab3a1fc9024f5d40f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4
 # libust and '.' (that contains the linker script). However, '.'
 # must be installed after libust so it can overwrite libust.so with
 # the linker script.
-SUBDIRS = libust . tests libmallocwrap ustd ustctl libinterfork include
+SUBDIRS = snprintf libust . tests libmallocwrap ustd ustctl libinterfork include
 
 EXTRA_DIST = doc libust.ldscript.in libust-initializer.c
 dist_bin_SCRIPTS = usttrace
@@ -16,7 +16,9 @@ ldscripts_DATA = libust.so libust-initializer.o
 CLEANFILES = $(ldscripts_DATA) ./tests/libust-initializer.Po
 
 libust.so: libust.ldscript.in
-       $(SED) -e "s@\@FORMAT\@@$(LIBFORMAT)@" -e "s@\@PATH\@@${libdir}@g" < $< > $@
+       $(SED) -e "s@\@FORMAT\@@$(LIBFORMAT)@" < $< > $@
 
+# 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) -c -I$(top_srcdir)/include -o $@ $<
+       $(CC) $(CFLAGS) -fPIC -c -I$(top_srcdir)/include -o $@ $<