From 58415b8b6071fddaa8f99c9799e9c30608dbb971 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sat, 7 Jan 2012 16:19:51 -0500 Subject: [PATCH] Move runas to common/ Signed-off-by: Mathieu Desnoyers --- Makefile.am | 1 - {librunas => common}/runas.c | 0 configure.ac | 1 - librunas/Makefile.am | 5 ----- lttng-consumerd/Makefile.am | 2 +- lttng-sessiond/Makefile.am | 1 - tests/Makefile.am | 2 +- 7 files changed, 2 insertions(+), 10 deletions(-) rename {librunas => common}/runas.c (100%) delete mode 100644 librunas/Makefile.am diff --git a/Makefile.am b/Makefile.am index 39b9f2f94..b744596b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -I config SUBDIRS = common \ liblttng-sessiond-comm \ libkernelctl \ - librunas \ liblttng-kconsumer \ liblttng-ustconsumer \ liblttng-consumer \ diff --git a/librunas/runas.c b/common/runas.c similarity index 100% rename from librunas/runas.c rename to common/runas.c diff --git a/configure.ac b/configure.ac index 9b8d9d34f..a55dfd55d 100644 --- a/configure.ac +++ b/configure.ac @@ -139,7 +139,6 @@ AC_CONFIG_FILES([ liblttng-ustconsumer/Makefile liblttngctl/Makefile liblttng-sessiond-comm/Makefile - librunas/Makefile lttng-consumerd/Makefile lttng-sessiond/Makefile lttng/Makefile diff --git a/librunas/Makefile.am b/librunas/Makefile.am deleted file mode 100644 index 92ec27242..000000000 --- a/librunas/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include - -noinst_LTLIBRARIES = librunas.la - -librunas_la_SOURCES = runas.c diff --git a/lttng-consumerd/Makefile.am b/lttng-consumerd/Makefile.am index a808e3ca8..9e8d036da 100644 --- a/lttng-consumerd/Makefile.am +++ b/lttng-consumerd/Makefile.am @@ -8,7 +8,7 @@ lttng_consumerd_LDADD = \ $(top_builddir)/libkernelctl/libkernelctl.la \ $(top_builddir)/liblttng-consumer/liblttng-consumer.la \ $(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la \ - $(top_builddir)/librunas/librunas.la + $(top_builddir)/common/libcommon.la if HAVE_LIBLTTNG_UST_CTL lttng_consumerd_LDADD += -llttng-ust-ctl diff --git a/lttng-sessiond/Makefile.am b/lttng-sessiond/Makefile.am index 00a87f4c3..b853e260b 100644 --- a/lttng-sessiond/Makefile.am +++ b/lttng-sessiond/Makefile.am @@ -37,7 +37,6 @@ lttng_sessiond_LDADD = -lrt -lurcu-common -lurcu \ $(top_builddir)/liblttng-sessiond-comm/liblttng-sessiond-comm.la \ $(top_builddir)/libkernelctl/libkernelctl.la \ $(top_builddir)/liblttngctl/liblttngctl.la \ - $(top_builddir)/librunas/librunas.la \ $(top_builddir)/common/libcommon.la if HAVE_LIBLTTNG_UST_CTL diff --git a/tests/Makefile.am b/tests/Makefile.am index 21bcace75..d775644c5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,7 +13,7 @@ LIBLTTNG=$(top_srcdir)/liblttngctl/lttngctl.c \ $(top_srcdir)/liblttng-sessiond-comm/lttng-sessiond-comm.c test_sessions_SOURCES = test_sessions.c $(UTILS) $(SESSIONS) -test_sessions_LDADD = $(top_builddir)/common/libcommon.la $(top_builddir)/librunas/librunas.la +test_sessions_LDADD = $(top_builddir)/common/libcommon.la test_kernel_data_trace_SOURCES = test_kernel_data_trace.c $(UTILS) $(KERN_DATA_TRACE) -- 2.34.1