X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=Makefile.am;h=6957f07de11c00c278f30e66f8f007b677457ddd;hb=686debc34cf055ffcb1f98a06df9fbaf27eeb441;hp=112e8ebf8944ab528cf11f793d78d16c9a666e1d;hpb=d169a27dd79a872d5c44f0547a2bb33bb8402b80;p=ust.git

diff --git a/Makefile.am b/Makefile.am
index 112e8eb..6957f07 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
-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
+SUBDIRS = snprintf libustcomm libustctl libust . tests libustinstr-malloc libustconsumer ust-consumerd ustctl libustfork include doc
 
-EXTRA_DIST = doc libust.ldscript.in libust-initializer.c
+EXTRA_DIST = libust.ldscript.in libust-initializer.c libust-initializer.h
 dist_bin_SCRIPTS = usttrace
 
 ldscriptsdir = $(libdir)
@@ -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 -I$(top_srcdir) -o $@ $<