update build system to find automatically installed kcompat and urcu

[ust.git] / ustd / Makefile.am

diff --git a/ustd/Makefile.am b/ustd/Makefile.am
index f2cb9597c319c0170bd2253eace0dbf29b572066..df49a82083e4f81e56614ab14accd60ac3c950ae 100644 (file)
--- a/ustd/Makefile.am
+++ b/ustd/Makefile.am
@@ -1,9 +1,7 @@
+INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libust \
+        -I$(top_builddir)/libustcomm
+
 bin_PROGRAMS = ustd
-ustd_SOURCES = lowlevel.c localerr.h ustd.c ustd.h $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/share/kref.c
+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
-
-INCLUDES = -I$(top_builddir)/share
-#INCLUDES += -I@URCU_PATH@
-INCLUDES += -I@KCOMPAT_PATH@
-INCLUDES += -I$(top_builddir)/libust
-INCLUDES += -I$(top_builddir)/libustcomm
+ustd_CFLAGS = -DUST_COMPONENT=ustd