cleanup: convenience libs at root of 'src/common/'

Change-Id: I6e1b4790eaceef9a1f203e82e756bbe6b85cce77
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index fa2a9da87a491cb1a7cdb586bba2816684c96f00..6e155f7dca3848991b74e5c97a555b86a2044a71 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -42,9 +42,9 @@ noinst_HEADERS += \
 
 noinst_LTLIBRARIES = \
        libcounter.la \
-       msgpack/libmsgpack.la \
+       libmsgpack.la \
        libringbuffer.la \
-       snprintf/libsnprintf.la \
+       libsnprintf.la \
        libcommon.la \
        libustcomm.la
 
@@ -72,11 +72,11 @@ endif
 libcounter_la_CFLAGS = -DUST_COMPONENT="libcounter" $(AM_CFLAGS)
 
 # msgpack
-msgpack_libmsgpack_la_SOURCES = \
+libmsgpack_la_SOURCES = \
        msgpack/msgpack.c \
        msgpack/msgpack.h
 
-msgpack_libmsgpack_la_CFLAGS = -DUST_COMPONENT="libmsgpack" $(AM_CFLAGS)
+libmsgpack_la_CFLAGS = -DUST_COMPONENT="libmsgpack" $(AM_CFLAGS)
 
 # ringbuffer
 libringbuffer_la_SOURCES = \
@@ -112,7 +112,7 @@ endif
 libringbuffer_la_CFLAGS = -DUST_COMPONENT="libringbuffer" $(AM_CFLAGS)
 
 # snprintf
-snprintf_libsnprintf_la_SOURCES = \
+libsnprintf_la_SOURCES = \
        snprintf/fflush.c \
        snprintf/fileext.h \
        snprintf/floatio.h \
@@ -133,8 +133,8 @@ libcommon_la_SOURCES = \
        patient.c
 
 libcommon_la_LIBADD = \
-       msgpack/libmsgpack.la \
-       snprintf/libsnprintf.la
+       libmsgpack.la \
+       libsnprintf.la
 
 libustcomm_la_SOURCES = \
        ustcomm.c \

diff --git a/tests/unit/libmsgpack/Makefile.am b/tests/unit/libmsgpack/Makefile.am
index 857b62b4493d8e907eaaefb088504e9c2c975d21..33f2b69e946560d38aaa39eed1cf2e6f860759a4 100644 (file)
--- a/tests/unit/libmsgpack/Makefile.am
+++ b/tests/unit/libmsgpack/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 noinst_PROGRAMS = test_msgpack
 test_msgpack_SOURCES = test_msgpack.c
 test_msgpack_LDADD = \
-       $(top_builddir)/src/common/msgpack/libmsgpack.la \
+       $(top_builddir)/src/common/libmsgpack.la \
        $(top_builddir)/tests/utils/libtap.a
 
 test_msgpack_CFLAGS = $(AM_CFLAGS)

diff --git a/tests/unit/snprintf/Makefile.am b/tests/unit/snprintf/Makefile.am
index cfc232a6e1c4e783f3c2fc58cf53df0328478c7b..14337de664aad976a22d41689ba041668eca04da 100644 (file)
--- a/tests/unit/snprintf/Makefile.am
+++ b/tests/unit/snprintf/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 noinst_PROGRAMS = test_snprintf
 test_snprintf_SOURCES = snprintf.c
 test_snprintf_LDADD = \
-       $(top_builddir)/src/common/snprintf/libsnprintf.la \
+       $(top_builddir)/src/common/libsnprintf.la \
        $(top_builddir)/tests/utils/libtap.a
 
 EXTRA_DIST = README