port ust to build system

diff --git a/Makefile.am b/Makefile.am
index 11e18439a9af8b0f13ee2bb755625289803b023b..32390bf7324d50e11169f8c6357250a9e8058317 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = libust hello libmallocwrap ustd
+SUBDIRS = libust hello libmallocwrap ustd ust

diff --git a/configure.ac b/configure.ac
index 075fe521bff11761c206b291e43e024025601b77..1f2d2c5de7012f78670924b95a168acc63cd3425 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -63,5 +63,5 @@ AC_SUBST(KCOMPAT_PATH)
 #                 ust/Makefile
 #                 ustd/Makefile])
 
-AC_CONFIG_FILES([Makefile libust/Makefile hello/Makefile libmallocwrap/Makefile ustd/Makefile])
+AC_CONFIG_FILES([Makefile libust/Makefile hello/Makefile libmallocwrap/Makefile ustd/Makefile ust/Makefile])
 AC_OUTPUT

diff --git a/ust/Makefile b/ust/Makefile
deleted file mode 100644 (file)
index 3aeec04..0000000
--- a/ust/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-all: ust
-
-ust: ust.c
-       gcc -g -Wall -I ../libustcomm -I. -I ../../../../libkcompat -o ust ust.c ../libustcomm/ustcomm.c
-
-.PHONY: ust

diff --git a/ust/Makefile.am b/ust/Makefile.am
new file mode 100644 (file)
index 0000000..e26a121
--- /dev/null
+++ b/ust/Makefile.am
@@ -0,0 +1,8 @@
+bin_PROGRAMS = ust
+ust_SOURCES = ust.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h
+
+#INCLUDES = -I$(top_builddir)/share
+#INCLUDES += -I@URCU_PATH@
+INCLUDES = -I@KCOMPAT_PATH@
+#INCLUDES += -I$(top_builddir)/libust
+INCLUDES += -I$(top_builddir)/libustcomm

diff --git a/ust/ust.c b/ust/ust.c
index 766a2fa2c01e20d20c4b3acd8c921a1aa135db0e..3f6bf1d0110aebea01c7f1bb01b15faeb22a8344 100644 (file)
--- a/ust/ust.c
+++ b/ust/ust.c
@@ -51,7 +51,10 @@ int main(int argc, char *argv[])
 
        char *msg = argv[2];
 
-       send_message(pid, msg, NULL);
+       struct ustcomm_connection conn;
+
+       ustcomm_connect_app(pid, &conn);
+       ustcomm_send_request(&conn, msg, NULL);
 
        return 0;
 }