From 635ead38ff3308bd6475f088d6a58e6267e53d86 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 12 Apr 2021 13:40:08 -0400 Subject: [PATCH] cleanup: convenience libs at root of 'src/common/' Change-Id: I6e1b4790eaceef9a1f203e82e756bbe6b85cce77 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- src/common/Makefile.am | 14 +++++++------- tests/unit/libmsgpack/Makefile.am | 2 +- tests/unit/snprintf/Makefile.am | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index fa2a9da8..6e155f7d 100644 --- 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 857b62b4..33f2b69e 100644 --- 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 cfc232a6..14337de6 100644 --- 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 -- 2.34.1