Reduce the number of Makefiles in 'src/' by one more

[babeltrace.git] / src / cli / Makefile.am

diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index adbf2bb06b271911cf25e392a7e4650f1b57e6af..d72ea16e9043a07c8a6fd9402e47da3dc409213b 100644 (file)
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -38,7 +38,7 @@ babeltrace2_bin_SOURCES = \
        babeltrace2-plugins.h \
        babeltrace2-query.c \
        babeltrace2-query.h \
-       logging.c \
+       logging.cpp \
        logging.h
 
 # -Wl,--no-as-needed is needed for recent gold linker who seems to think
@@ -57,14 +57,14 @@ EXTRA_babeltrace2_bin_DEPENDENCIES =
 # directly).
 babeltrace2_bin_LDADD = \
        $(top_builddir)/src/argpar/libargpar.la \
-       $(top_builddir)/src/autodisc/libbabeltrace2-autodisc.la \
-       $(top_builddir)/src/param-parse/libbabeltrace2-param-parse.la \
-       $(top_builddir)/src/string-format/libbabeltrace2-string-format.la \
+       $(top_builddir)/src/autodisc/libautodisc.la \
+       $(top_builddir)/src/param-parse/libparam-parse.la \
+       $(top_builddir)/src/string-format/libstring-format.la \
        $(top_builddir)/src/lib/libbabeltrace2.la \
        $(top_builddir)/src/compat/libcompat.la \
-       $(top_builddir)/src/common/libbabeltrace2-common.la \
-       $(top_builddir)/src/logging/libbabeltrace2-logging.la \
-       $(top_builddir)/src/ctfser/libbabeltrace2-ctfser.la
+       $(top_builddir)/src/common/libcommon.la \
+       $(top_builddir)/src/logging/liblogging.la \
+       $(top_builddir)/src/ctfser/libctfser.la
 
 if ENABLE_BUILT_IN_PLUGINS
 # Takes a plugin name and outputs the needed LDFLAGS to embed it.