From 441945d6690a549ce77830e6b4b9036fbe0a1e38 Mon Sep 17 00:00:00 2001 From: nirenjan Date: Fri, 3 Dec 2021 23:05:15 -0800 Subject: [PATCH] Rearrange pinelog sources --- Makefile.am | 10 +++++----- pinelog.c => src/pinelog.c | 0 pinelog.h => src/pinelog.h | 0 bench_pinelog.c => test/bench_pinelog.c | 0 test_pinelog.c => test/test_pinelog.c | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename pinelog.c => src/pinelog.c (100%) rename pinelog.h => src/pinelog.h (100%) rename bench_pinelog.c => test/bench_pinelog.c (100%) rename test_pinelog.c => test/test_pinelog.c (100%) diff --git a/Makefile.am b/Makefile.am index b48f9ae..2e5e9c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,17 +10,17 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ LICENSE \ README.md \ - pinelog.h + src/pinelog.h noinst_LTLIBRARIES = libpinelog.la # pinelog logging library -libpinelog_la_SOURCES = pinelog.c +libpinelog_la_SOURCES = src/pinelog.c libpinelog_la_CFLAGS = @PINELOG_CFLAGS@ $(WARN_CFLAGS) -I $(top_builddir) libpinelog_la_LDFLAGS = $(WARN_LDFLAGS) -test_SRCFILES = test_pinelog.c $(libpinelog_la_SOURCES) -bench_SRCFILES = bench_pinelog.c $(libpinelog_la_SOURCES) +test_SRCFILES = test/test_pinelog.c $(libpinelog_la_SOURCES) +bench_SRCFILES = test/bench_pinelog.c $(libpinelog_la_SOURCES) test_CFLAGS = \ -DPINELOG_FATAL_STR='"F"' \ -DPINELOG_ERROR_STR='"E"' \ @@ -30,7 +30,7 @@ test_CFLAGS = \ -DPINELOG_TRACE_STR='"T"' \ -DPINELOG_DEFAULT_LEVEL=PINELOG_LVL_TRACE \ -DPINELOG_DEFAULT_STREAM=stderr \ - -DPINELOG_TEST -I $(top_builddir) + -DPINELOG_TEST -I $(top_builddir) -I $(top_srcdir)/src LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh --comments TESTS = \ diff --git a/pinelog.c b/src/pinelog.c similarity index 100% rename from pinelog.c rename to src/pinelog.c diff --git a/pinelog.h b/src/pinelog.h similarity index 100% rename from pinelog.h rename to src/pinelog.h diff --git a/bench_pinelog.c b/test/bench_pinelog.c similarity index 100% rename from bench_pinelog.c rename to test/bench_pinelog.c diff --git a/test_pinelog.c b/test/test_pinelog.c similarity index 100% rename from test_pinelog.c rename to test/test_pinelog.c