X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2FMakefile.am;h=32d0aff54f3c04123caf170ec31b158eaa063df8;hp=e00a880263adba798a93474b387b9f2cbd4f29b8;hb=3e3665b89947ebdd812bcfaca1090d22b34d5778;hpb=a4b92340642035d1eafeb1eead0ad01f64d2007d

diff --git a/src/lib/lttng-ctl/Makefile.am b/src/lib/lttng-ctl/Makefile.am
index e00a88026..32d0aff54 100644
--- a/src/lib/lttng-ctl/Makefile.am
+++ b/src/lib/lttng-ctl/Makefile.am
@@ -1,28 +1,21 @@
-lib_LTLIBRARIES = liblttng-ctl.la
-noinst_PROGRAMS = filter-grammar-test
+SUBDIRS = filter
+
+AM_CPPFLAGS += -I$(srcdir) -I$(builddir)
 
-BUILT_SOURCES = filter-parser.h
-AM_YFLAGS = -t -d -v
+lib_LTLIBRARIES = liblttng-ctl.la
 
-noinst_HEADERS = filter-ast.h
-liblttng_ctl_la_SOURCES = lttng-ctl.c \
-	filter-lexer.l filter-parser.y \
-	filter-visitor-set-parent.c \
-	filter-visitor-xml.c \
-	filter-visitor-generate-ir.c \
-	filter-visitor-ir-check-binary-op-nesting.c \
-	filter-visitor-generate-bytecode.c \
-	align.h \
-	bug.h \
-	filter-ast.h \
-	filter-bytecode.h \
-	filter-ir.h \
-	memstream.h
+liblttng_ctl_la_SOURCES = lttng-ctl.c snapshot.c lttng-ctl-helper.h \
+		lttng-ctl-health.c save.c load.c deprecated-symbols.c \
+		channel.c rotate.c event.c destruction-handle.c
 
-filter_grammar_test_SOURCES = filter-grammar-test.c
-filter_grammar_test_LDADD = liblttng-ctl.la
+liblttng_ctl_la_LDFLAGS = \
+		$(LT_NO_UNDEFINED)
 
 liblttng_ctl_la_LIBADD = \
 		$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
 		$(top_builddir)/src/common/libcommon.la \
-		$(top_builddir)/src/common/hashtable/libhashtable.la
+		$(top_builddir)/src/common/hashtable/libhashtable.la \
+		$(top_builddir)/src/lib/lttng-ctl/filter/libfilter.la
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = lttng-ctl.pc