bin_PROGRAMS = ust
-ust_SOURCES = ust.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h
+ust_SOURCES = ust.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/libustcmd/ustcmd.c $(top_builddir)/libustcmd/ustcmd.h $(top_builddir)/share/usterr.h
+ust_CFLAGS = -DUST_COMPONENT=ust
-#INCLUDES = -I$(top_builddir)/share
-#INCLUDES += -I@URCU_PATH@
-INCLUDES = -I@KCOMPAT_PATH@
-#INCLUDES += -I$(top_builddir)/libust
+INCLUDES = $(KCOMPAT_CFLAGS)
INCLUDES += -I$(top_builddir)/libustcomm
+INCLUDES += -I$(top_builddir)/libustcmd
+INCLUDES += -I$(top_builddir)/share