X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=84fae3c356c7a628113b3eb9a5b48c0ca5564905;hb=1e649dff604c8d842b652f9ead15267fce1f6a66;hp=0f3182142012e86137b8d33cdb85410153754fda;hpb=6fbd4105b92d0da8b3c5818a5b7c5b07850f4a01;p=babeltrace.git diff --git a/configure.ac b/configure.ac index 0f318214..84fae3c3 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,7 @@ AC_CHECK_HEADERS([ \ sys/socket.h \ ]) -if test ! -f "$srcdir/formats/ctf/metadata/ctf-parser.h"; then +if test ! -f "$srcdir/plugins/ctf/common/metadata/parser.h"; then if test x"$(basename "$YACC")" != "xbison -y"; then AC_MSG_ERROR([[bison not found and is required when building from git. Please install bison]]) @@ -72,7 +72,7 @@ if test ! -f "$srcdir/formats/ctf/metadata/ctf-parser.h"; then ]) fi -if test ! -f "$srcdir/formats/ctf/metadata/ctf-lexer.c"; then +if test ! -f "$srcdir/plugins/ctf/common/metadata/lexer.c"; then if test x"$LEX" != "xflex"; then AC_MSG_ERROR([[flex not found and is required when building from git. Please install flex]]) @@ -398,23 +398,20 @@ AC_SUBST(DEFAULT_INCLUDES) babeltraceincludedir="${includedir}/babeltrace" AC_SUBST(babeltraceincludedir) -babeltracectfincludedir="${includedir}/babeltrace/ctf" -AC_SUBST(babeltracectfincludedir) - babeltracectfwriterincludedir="${includedir}/babeltrace/ctf-writer" AC_SUBST(babeltracectfwriterincludedir) +babeltracectfincludedir="${includedir}/babeltrace/ctf" +AC_SUBST(babeltracectfincludedir) + babeltracectfirincludedir="${includedir}/babeltrace/ctf-ir" AC_SUBST(babeltracectfirincludedir) babeltracepluginincludedir="${includedir}/babeltrace/plugin" AC_SUBST(babeltracepluginincludedir) -babeltracecomponentincludedir="${includedir}/babeltrace/component" -AC_SUBST(babeltracecomponentincludedir) - -babeltracecomponentnotifincludedir="${includedir}/babeltrace/component/notification" -AC_SUBST(babeltracecomponentnotifincludedir) +babeltracegraphincludedir="${includedir}/babeltrace/graph" +AC_SUBST(babeltracegraphincludedir) program_transform_name="s&babeltrace\.bin&babeltrace&;$program_transform_name" AC_SUBST(program_transform_name) @@ -447,24 +444,12 @@ AS_IF([test "x$enable_api_doc" = "xyes"], [ AC_CONFIG_FILES([ Makefile - types/Makefile common/Makefile compat/Makefile - formats/Makefile - formats/ctf/Makefile - formats/ctf/types/Makefile - formats/ctf-text/Makefile - formats/ctf-text/types/Makefile - formats/ctf-metadata/Makefile - formats/bt-dummy/Makefile - formats/lttng-live/Makefile - formats/ctf/metadata/Makefile - formats/ctf/writer/Makefile - formats/ctf/ir/Makefile - converter/Makefile + cli/Makefile doc/Makefile - doc/api/Makefile - doc/api/Doxyfile + doc/api/Makefile + doc/api/Doxyfile doc/bindings/Makefile doc/bindings/python/Makefile doc/images/Makefile @@ -473,6 +458,8 @@ AC_CONFIG_FILES([ lib/plugin/Makefile lib/component/Makefile lib/component/notification/Makefile + lib/ctf-ir/Makefile + lib/ctf-writer/Makefile include/Makefile bindings/Makefile bindings/python/Makefile @@ -507,6 +494,8 @@ AC_CONFIG_FILES([ plugins/utils/dummy/Makefile plugins/utils/trimmer/Makefile python-plugin-provider/Makefile + plugins/libctfcopytrace/Makefile + plugins/debug-info/Makefile babeltrace.pc babeltrace-ctf.pc ]) @@ -524,7 +513,6 @@ AC_CONFIG_FILES([tests/bin/intersection/test_intersection], [chmod +x tests/bin/ AC_CONFIG_FILES([tests/bin/intersection/bt_python_helper.py]) AC_CONFIG_FILES([tests/lib/writer/bt_python_helper.py]) AC_CONFIG_FILES([tests/bin/test_packet_seq_num], [chmod +x tests/bin/test_packet_seq_num]) -AC_CONFIG_FILES([tests/bin/test_formats], [chmod +x tests/bin/test_formats]) AS_IF([test "x$enable_python" = "xyes"], [ AC_CONFIG_FILES(