Move away headers that will be deprecated

[lttng-ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bff619836298e38d90aaec245f36d2f19a488a4e..0a9cde64acfe3d892db0b1bbf5efce60a1551325 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,10 +5,9 @@ ACLOCAL_AMFLAGS = -I config
 # libust and '.' (that contains the linker script). However, '.'
 # must be installed after libust so it can overwrite libust.so with
 # the linker script.
-SUBDIRS = snprintf libustcomm libustctl libust . tests libustinstr-malloc libustconsumer ust-consumerd ustctl libustfork include doc
+SUBDIRS = snprintf libust . tests libustinstr-malloc libustfork include doc
 
 EXTRA_DIST = libust.ldscript.in libust-initializer.c libust-initializer.h
-dist_bin_SCRIPTS = usttrace
 
 ldscriptsdir = $(libdir)
 ldscripts_DATA = libust.so libust-initializer.o
@@ -24,4 +23,4 @@ libust-initializer.o: libust-initializer.c
        $(CC) $(CFLAGS) -fno-strict-aliasing -fPIC -c -I$(top_srcdir)/include -I$(top_srcdir) -o $@ $<
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ust.pc
\ No newline at end of file
+pkgconfig_DATA = ust.pc