Generalize some ustcomm functionality

[ust.git] / ustd / Makefile.am

diff --git a/ustd/Makefile.am b/ustd/Makefile.am
index e17854035243834a004e675ab90402201043cb87..991c717e13844d6f3c58edc7d4b19480f872b364 100644 (file)
--- 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 -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