X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=e79321e941e39b99407f544b600f736e7870e37a;hb=331731aa31dbd587ebd54e32c7f6c136f34aef7e;hp=6789ef6cb2de64bb675a3d8e7cec86b1efa3cbd3;hpb=b04a139e576b2e852350f15a56692e8a7bc0149f;p=babeltrace.git diff --git a/configure.ac b/configure.ac index 6789ef6c..e79321e9 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,7 @@ m4_define([bt_lib_version], bt_lib_version_current[:]bt_lib_version_revision[:]b AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_lib_version) -AC_CONFIG_HEADERS([include/config.h]) +AC_CONFIG_HEADERS([src/common/config.h]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) AC_REQUIRE_AUX_FILE([tap-driver.sh]) @@ -684,7 +684,7 @@ AM_CFLAGS="-Wall -Wformat -Werror=implicit-function-declaration $PTHREAD_CFLAGS AC_SUBST(AM_CFLAGS) # Set global CPPFLAGS in AM_CPPFLAGS -AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -include config.h" +AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/src -I\$(top_srcdir)/src -include common/config.h" AC_SUBST(AM_CPPFLAGS) # Add glib to global link libs @@ -725,66 +725,66 @@ program_transform_name="s&babeltrace2\.bin&babeltrace2&;s&babeltrace2-log\.bin&b AC_SUBST(program_transform_name) AC_CONFIG_FILES([ - Makefile - bindings/python/Makefile - bindings/python/bt2/Makefile - bindings/python/bt2/setup.py - bindings/python/bt2/bt2/__init__.py - common/Makefile - ctfser/Makefile - compat/Makefile - cli/Makefile - doc/Makefile - doc/api/Makefile doc/api/Doxyfile + doc/api/Makefile doc/bindings/Makefile doc/bindings/python/Makefile doc/contributing-images/Makefile - doc/man/Makefile - doc/man/asciidoc-attrs.conf - fd-cache/Makefile - lib/Makefile - lib/prio_heap/Makefile - lib/plugin/Makefile - lib/graph/Makefile - lib/graph/message/Makefile - lib/trace-ir/Makefile - lib/ctf-writer/Makefile + doc/Makefile + doc/man/asciidoc-attrs.conf + doc/man/Makefile include/Makefile - logging/Makefile - bindings/Makefile - tests/Makefile + Makefile + src/babeltrace2-ctf-writer.pc + src/babeltrace2.pc + src/bindings/Makefile + src/bindings/python/bt2/bt2/__init__.py + src/bindings/python/bt2/Makefile + src/bindings/python/bt2/setup.py + src/bindings/python/Makefile + src/cli/Makefile + src/common/Makefile + src/compat/Makefile + src/ctfser/Makefile + src/ctf-writer/Makefile + src/fd-cache/Makefile + src/lib/graph/Makefile + src/lib/graph/message/Makefile + src/lib/Makefile + src/lib/plugin/Makefile + src/lib/prio-heap/Makefile + src/lib/trace-ir/Makefile + src/logging/Makefile + src/Makefile + src/plugins/ctf/common/bfcr/Makefile + src/plugins/ctf/common/Makefile + src/plugins/ctf/common/metadata/Makefile + src/plugins/ctf/common/msg-iter/Makefile + src/plugins/ctf/common/utils/Makefile + src/plugins/ctf/fs-sink/Makefile + src/plugins/ctf/fs-src/Makefile + src/plugins/ctf/lttng-live/Makefile + src/plugins/ctf/Makefile + src/plugins/lttng-utils/debug-info/Makefile + src/plugins/lttng-utils/Makefile + src/plugins/Makefile + src/plugins/text/dmesg/Makefile + src/plugins/text/Makefile + src/plugins/text/pretty/Makefile + src/plugins/utils/counter/Makefile + src/plugins/utils/dummy/Makefile + src/plugins/utils/Makefile + src/plugins/utils/muxer/Makefile + src/plugins/utils/trimmer/Makefile + src/python-plugin-provider/Makefile + tests/ctf-writer/Makefile tests/lib/Makefile tests/lib/test-plugin-plugins/Makefile + tests/Makefile + tests/plugins/Makefile tests/utils/common.sh tests/utils/Makefile tests/utils/tap/Makefile - tests/plugins/Makefile - extras/Makefile - extras/valgrind/Makefile - plugins/Makefile - plugins/ctf/Makefile - plugins/ctf/common/Makefile - plugins/ctf/common/bfcr/Makefile - plugins/ctf/common/metadata/Makefile - plugins/ctf/common/msg-iter/Makefile - plugins/ctf/common/utils/Makefile - plugins/ctf/fs-src/Makefile - plugins/ctf/fs-sink/Makefile - plugins/ctf/lttng-live/Makefile - plugins/text/Makefile - plugins/text/dmesg/Makefile - plugins/text/pretty/Makefile - plugins/utils/Makefile - plugins/utils/dummy/Makefile - plugins/utils/counter/Makefile - plugins/utils/trimmer/Makefile - plugins/utils/muxer/Makefile - python-plugin-provider/Makefile - plugins/lttng-utils/Makefile - plugins/lttng-utils/debug-info/Makefile - babeltrace2.pc - babeltrace2-ctf.pc ]) AC_CONFIG_FILES([tests/cli/test_intersection], [chmod +x tests/cli/test_intersection]) @@ -794,10 +794,9 @@ AC_CONFIG_FILES([tests/cli/test_packet_seq_num], [chmod +x tests/cli/test_packet AC_CONFIG_FILES([tests/cli/test_trace_copy], [chmod +x tests/cli/test_trace_copy]) AC_CONFIG_FILES([tests/cli/test_trace_read], [chmod +x tests/cli/test_trace_read]) AC_CONFIG_FILES([tests/cli/test_trimmer], [chmod +x tests/cli/test_trimmer]) -AC_CONFIG_FILES([tests/lib/test_ctf_writer_complete], [chmod +x tests/lib/test_ctf_writer_complete]) +AC_CONFIG_FILES([tests/ctf-writer/test_ctf_writer], [chmod +x tests/ctf-writer/test_ctf_writer]) AC_CONFIG_FILES([tests/lib/test_plugin_complete], [chmod +x tests/lib/test_plugin_complete]) AC_CONFIG_FILES([tests/lib/trace-ir/test_trace_ir], [chmod +x tests/lib/trace-ir/test_trace_ir]) -AC_CONFIG_FILES([tests/lib/ctf-writer/test_ctf_writer], [chmod +x tests/lib/ctf-writer/test_ctf_writer]) AC_CONFIG_FILES([tests/plugins/ctf/test_ctf_plugin], [chmod +x tests/plugins/ctf/test_ctf_plugin]) AC_CONFIG_FILES([tests/plugins/test_utils_muxer_complete], [chmod +x tests/plugins/test_utils_muxer_complete]) AC_CONFIG_FILES([tests/plugins/test_lttng_utils_debug_info], [chmod +x tests/plugins/test_lttng_utils_debug_info])