The objective is to move internal headers from the global 'include'
directory to their respective private directories under 'src'.
Move the private generated 'config.h' to 'src/common/config.h', this way
it can be include with 'common/config.h' and reduce the risk of clashing
with a similarly named file.
This is part of an effort to standardize our autotools setup across
projects to simplify maintenance.
Change-Id: Ie62a81e46458bffb6d31af66411865f23cf1cb4f
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
/configure
/aclocal.m4
/autom4te.cache
/configure
/aclocal.m4
/autom4te.cache
-/include/config.h
-/include/config.h.in
-/include/stamp-h1
/include/lttng/stamp-h2
/include/lttng/stamp-h3
/include/lttng/ust-version.h
/include/lttng/stamp-h2
/include/lttng/stamp-h3
/include/lttng/ust-version.h
+/src/common/config.h
+/src/common/config.h.in
+/src/common/stamp-h1
/doc/examples/demo/demo
/doc/examples/easy-ust/sample
/doc/examples/demo/demo
/doc/examples/easy-ust/sample
AC_PREREQ([2.69])
AC_INIT([lttng-ust],[ust_version],[mathieu dot desnoyers at efficios dot com],[],[https://lttng.org])
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])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
# 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.
# 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)
AC_SUBST(AM_CPPFLAGS)
AC_SUBST(JNI_CPPFLAGS)
CPPFLAGS="$(CPPFLAGS)" \
AM_CPPFLAGS="$(AM_CPPFLAGS) \
-I$$rel_src_subdir$(top_srcdir)/include/ \
CPPFLAGS="$(CPPFLAGS)" \
AM_CPPFLAGS="$(AM_CPPFLAGS) \
-I$$rel_src_subdir$(top_srcdir)/include/ \
- -I$$rel_build_subdir$(top_builddir)/include/" \
+ -I$$rel_build_subdir$(top_builddir)/include/ \
+ -I$$rel_src_subdir$(top_srcdir)/src/ \
+ -I$$rel_build_subdir$(top_builddir)/src/" \
CFLAGS='$(CFLAGS)' \
AM_CFLAGS='$(AM_CFLAGS)' \
LDFLAGS="$(LDFLAGS)" \
CFLAGS='$(CFLAGS)' \
AM_CFLAGS='$(AM_CFLAGS)' \
LDFLAGS="$(LDFLAGS)" \
--- /dev/null
+# Git doesn't support empty folders