cleanup: convenience libs at root of 'src/common/'

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 99b998524b7236d6361bef844716131b6ee569a4..561eb08cbf26c880d409f88fe879cf5c15836b8c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ m4_define([ust_ctl_lib_version], ust_ctl_lib_version_current[:]ust_ctl_lib_versi
 AC_PREREQ([2.69])
 AC_INIT([lttng-ust],[ust_version],[mathieu dot desnoyers at efficios dot com],[],[https://lttng.org])
 
-AC_CONFIG_HEADERS([include/config.h include/lttng/ust-config.h include/lttng/ust-version.h])
+AC_CONFIG_HEADERS([src/common/config.h include/lttng/ust-config.h include/lttng/ust-version.h])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -501,7 +501,7 @@ AC_SUBST(AM_CXXFLAGS)
 # The order in which the include folders are searched is important.
 # The top_builddir should always be searched first in the event that a build
 # time generated file is included.
-AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -include config.h"
+AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -I\$(top_builddir)/src -I\$(top_srcdir)/src -include common/config.h"
 AC_SUBST(AM_CPPFLAGS)
 
 AC_SUBST(JNI_CPPFLAGS)
@@ -518,36 +518,33 @@ AC_CONFIG_FILES([
   doc/Makefile
   doc/man/Makefile
   include/Makefile
-  src/libcounter/Makefile
-  src/liblttng-ust-comm/Makefile
-  src/liblttng-ust-ctl/Makefile
-  src/liblttng-ust-cyg-profile/Makefile
-  src/liblttng-ust-dl/Makefile
-  src/liblttng-ust-fd/Makefile
-  src/liblttng-ust-fork/Makefile
-  src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile
-  src/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile
-  src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
-  src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile
-  src/liblttng-ust-java-agent/java/Makefile
-  src/liblttng-ust-java-agent/jni/common/Makefile
-  src/liblttng-ust-java-agent/jni/jul/Makefile
-  src/liblttng-ust-java-agent/jni/log4j/Makefile
-  src/liblttng-ust-java-agent/jni/Makefile
-  src/liblttng-ust-java-agent/Makefile
-  src/liblttng-ust-java/Makefile
-  src/liblttng-ust-libc-wrapper/Makefile
+  src/common/Makefile
+  src/lib/lttng-ust-ctl/Makefile
+  src/lib/lttng-ust-cyg-profile/Makefile
+  src/lib/lttng-ust-dl/Makefile
+  src/lib/lttng-ust-fd/Makefile
+  src/lib/lttng-ust-fork/Makefile
+  src/lib/lttng-ust-java-agent/java/lttng-ust-agent-all/Makefile
+  src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/Makefile
+  src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
+  src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile
+  src/lib/lttng-ust-java-agent/java/Makefile
+  src/lib/lttng-ust-java-agent/jni/common/Makefile
+  src/lib/lttng-ust-java-agent/jni/jul/Makefile
+  src/lib/lttng-ust-java-agent/jni/log4j/Makefile
+  src/lib/lttng-ust-java-agent/jni/Makefile
+  src/lib/lttng-ust-java-agent/Makefile
+  src/lib/lttng-ust-java/Makefile
+  src/lib/lttng-ust-libc-wrapper/Makefile
   src/liblttng-ust/Makefile
-  src/liblttng-ust-python-agent/Makefile
-  src/libmsgpack/Makefile
-  src/libringbuffer/Makefile
+  src/lib/lttng-ust-python-agent/Makefile
+  src/lib/Makefile
   src/lttng-ust-ctl.pc
   src/lttng-ust.pc
   src/Makefile
   src/python-lttngust/lttngust/version.py
   src/python-lttngust/Makefile
   src/python-lttngust/setup.py
-  src/snprintf/Makefile
   tests/benchmark/Makefile
   tests/compile/ctf-types/Makefile
   tests/compile/hello.cxx/Makefile