From 82b1a169790ffaa20bcc0b338d0c4e8cf68bf73c Mon Sep 17 00:00:00 2001 From: Pierre-Marc Fournier Date: Mon, 30 Mar 2009 19:34:06 -0400 Subject: [PATCH] port ust to build system --- Makefile.am | 2 +- configure.ac | 2 +- ust/Makefile | 6 ------ ust/Makefile.am | 8 ++++++++ ust/ust.c | 5 ++++- 5 files changed, 14 insertions(+), 9 deletions(-) delete mode 100644 ust/Makefile create mode 100644 ust/Makefile.am diff --git a/Makefile.am b/Makefile.am index 11e1843..32390bf 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 075fe52..1f2d2c5 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 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 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 766a2fa..3f6bf1d 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; } -- 2.34.1