Check for C++11 when building C++ probe providers

[lttng-ust.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7fc4fd48d56a60d10e50ac11eafea0bb4f8cf227..9ab93ccd2377e4aaed9c2bf1107925aec8012174 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,41 +2,13 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \
-               libcounter \
-               libmsgpack \
-               liblttng-ust \
-               liblttng-ust-ctl \
-               liblttng-ust-fd \
-               liblttng-ust-fork \
-               liblttng-ust-libc-wrapper \
-               liblttng-ust-cyg-profile \
-               tools
-
-if HAVE_DLINFO
-SUBDIRS += liblttng-ust-dl
-endif
-
-if BUILD_JNI_INTERFACE
-SUBDIRS += liblttng-ust-java
-endif
-
-if BUILD_JAVA_AGENT
-SUBDIRS += liblttng-ust-java-agent
-endif
-
-if BUILD_PYTHON_AGENT
-SUBDIRS += python-lttngust \
-               liblttng-ust-python-agent
-endif
-
-SUBDIRS += tests doc
-
-#temporarily disabled
-# liblttng-ust-malloc
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = lttng-ust.pc lttng-ust-ctl.pc
+SUBDIRS = \
+       include \
+       src \
+       tools \
+       doc \
+       tests \
+       extras
 
 dist_doc_DATA = \
        ChangeLog \