X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ustd%2FMakefile.am;h=09d098488e10d39eb736b0b0bfbfaed4bdd380d9;hb=f51d84eac11907346fa02e33da358aad171ac80a;hp=4aaa05fe2212e5cf5538f0e51d95c205e64c2598;hpb=8434447d3c95cc75f6b4be9f0fefdd0fbda51a81;p=lttng-ust.git

diff --git a/ustd/Makefile.am b/ustd/Makefile.am
index 4aaa05fe..09d09848 100644
--- a/ustd/Makefile.am
+++ b/ustd/Makefile.am
@@ -1,7 +1,14 @@
-INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust \
-	 -I$(top_builddir)/libustcomm $(KCOMPAT_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/libust -I$(top_srcdir)/libustcomm \
+	-I$(top_srcdir)/include
+AM_CFLAGS = -fno-strict-aliasing
 
 bin_PROGRAMS = ustd
-ustd_SOURCES = lowlevel.c localerr.h ustd.c ustd.h $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h
+
+ustd_SOURCES = lowlevel.c ustd.c ustd.h
+
+ustd_LDADD = \
+	$(top_builddir)/snprintf/libustsnprintf.la \
+	$(top_builddir)/libustcomm/libustcomm.la
+
 ustd_LDFLAGS = -lpthread
-ustd_CFLAGS = -DUST_COMPONENT=ustd
+ustd_CFLAGS = -DUST_COMPONENT=ustd -fno-strict-aliasing