From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Mon, 30 Mar 2009 23:34:06 +0000 (-0400)
Subject: port ust to build system
X-Git-Tag: v1.9.1~1016
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=82b1a169790ffaa20bcc0b338d0c4e8cf68bf73c;p=lttng-ust.git

port ust to build system
---

diff --git a/Makefile.am b/Makefile.am
index 11e18439..32390bf7 100644
--- 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 075fe521..1f2d2c5d 100644
--- 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
index 3aeec040..00000000
--- 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
index 00000000..e26a1213
--- /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 766a2fa2..3f6bf1d0 100644
--- 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;
 }