X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=Makefile.am;h=c77ef8f03a74154197381465c688fe91d0b63b25;hb=245d371ea1c17d6196af065a40dfcdc671b40f41;hp=05ea397ec600bedde4b880b8998601364171065a;hpb=43550d379ea53556183002632da0d23c0c417d03;p=ust.git

diff --git a/Makefile.am b/Makefile.am
index 05ea397..c77ef8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,11 @@
-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 libustcomm libustcmd libust . tests libustinstr-malloc libustd ustd ustctl libustfork include doc
 
 EXTRA_DIST = libust.ldscript.in libust-initializer.c
 dist_bin_SCRIPTS = usttrace
@@ -21,4 +21,4 @@ libust.so: libust.ldscript.in
 # 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 -o $@ $<