-AM_CPPFLAGS = -I$(top_builddir)/share -I$(top_builddir)/libust \
- -I$(top_builddir)/libustcomm -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/libust -I$(top_srcdir)/libustcomm \
+ -I$(top_srcdir)/include -I$(top_srcdir)/libustd
+AM_CFLAGS = -fno-strict-aliasing
bin_PROGRAMS = ustd
-ustd_SOURCES = lowlevel.c ustd.c ustd.h $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/share/usterr.h
-ustd_LDFLAGS = -lpthread
-ustd_CFLAGS = -DUST_COMPONENT=ustd
+
+ustd_SOURCES = ustd.c
+
+ustd_LDADD = \
+ $(top_builddir)/snprintf/libustsnprintf.la \
+ $(top_builddir)/libustcomm/libustcomm.la \
+ $(top_builddir)/libustd/libustd.la
+
+ustd_CFLAGS = -DUST_COMPONENT=ustd -fno-strict-aliasing