Link Nexus converter to libbabeltrace

Signed-off-by: Christian Babeux <christian.babeux@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/converter/nexus/Makefile.am b/converter/nexus/Makefile.am
index 010cd2727b7b76904a9298d62f62370d41b3d257..b6923ce39f85bfefd3596268ec562f7a8ed4978f 100644 (file)
--- a/converter/nexus/Makefile.am
+++ b/converter/nexus/Makefile.am
@@ -1,27 +1,8 @@
-#
-# Copyright (C) 2013 Freescale Semiconductor, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-#
+AM_CXXFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 
-bin_PROGRAMS=nexdump
-nexdump_SOURCES=main.cpp \
+bin_PROGRAMS = nexdump
+nexdump_SOURCES = \
+               main.cpp \
                Application.h \
                Application.cpp \
                AUXMessageProtocol.h \
@@ -47,3 +28,7 @@ nexdump_SOURCES=main.cpp \
                NxPacketSet.cpp \
                SizedAddress.h \
                SizedAddress.cpp
+
+nexdump_LDADD = \
+               $(top_builddir)/lib/libbabeltrace.la \
+               $(top_builddir)/formats/ctf/libbabeltrace-ctf.la