diff --git a/.gitignore b/.gitignore
index 628fd48..6da54be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,58 +1,3 @@
 build*/
 subprojects/*
 !subprojects/*.wrap
-
-Makefile
-Makefile.in
-aclocal.m4
-ar-lib
-*-libtool
-autom4te.cache*
-aminclude_static.am
-compile
-config.*
-depcomp
-phosphor-logging/elog-errors.hpp
-install-sh
-logging-test
-logging_test.o
-ltmain.sh
-missing
-test-driver
-test/.deps*
-*.dirstamp
-test/Makefile
-test/Makefile.in
-.deps*
-configure
-stamp-h1
-phosphor-logging-*.*
-xyz/openbmc_project/Logging/Internal/Manager/
-*.o
-*.la
-*.lo
-.libs/
-libtool
-callout-test
-callouts-gen.hpp
-elog-lookup.cpp
-elog-process-metadata.cpp
-phosphor-log-manager
-phosphor-logging.pc
-test/*_test.log
-test/*_test.trs
-test/*_test_*.log
-test/*_test_*.trs
-test/test-suite.log
-*.gcda
-*.gcno
-*.trs
-*-coverage*
-test/remote_logging_test_address
-test/remote_logging_test_config
-test/remote_logging_test_port
-test/serialization_test_path
-test/serialization_test_properties
-test/*_test
-phosphor-rsyslog-config/phosphor-rsyslog-conf
-peltool
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 0ef7221..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,155 +0,0 @@
-if AUTOCONF_CODE_COVERAGE_2019_01_06
-include $(top_srcdir)/Makefile.am.include
-include $(top_srcdir)/aminclude_static.am
-clean-local: code-coverage-clean
-distclean-local: code-coverage-dist-clean
-else
-@CODE_COVERAGE_RULES@
-endif
-
-AM_LIBS = $(CODE_COVERAGE_LIBS)
-AM_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) -UNDEBUG $(GTEST_CPPFLAGS)
-AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
-AM_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-AM_LDFLAGS = $(GMOCK_LIBS) -lgmock_main \
-	$(GTEST_LIBS) $(OESDK_TESTCASE_FLAGS) $(PTHREAD_LIBS) $(SDBUSPLUS_LIBS)
-
-if !INSTALL_SCRIPTS
-# export these headers
-nobase_include_HEADERS = \
-	phosphor-logging/log.hpp \
-	phosphor-logging/elog.hpp \
-	phosphor-logging/sdjournal.hpp \
-	phosphor-logging/test/sdjournal_mock.hpp
-
-nobase_nodist_include_HEADERS = \
-	phosphor-logging/elog-errors.hpp \
-	xyz/openbmc_project/Logging/Internal/Manager/server.hpp
-
-libphosphor_logging_FILES = \
-	elog.cpp elog_meta.cpp sdjournal.cpp
-libphosphor_loggingdir = ${libdir}
-libphosphor_logging_LTLIBRARIES = libphosphor_logging.la
-libphosphor_logging_la_SOURCES = $(libphosphor_logging_FILES)
-libphosphor_logging_la_LDFLAGS = \
-	$(SYSTEMD_LIBS) \
-	$(SDBUSPLUS_LIBS) \
-	-version-info 1:0:0 -shared
-libphosphor_logging_la_CXXFLAGS = \
-	$(SDBUSPLUS_CFLAGS) \
-	$(SYSTEMD_CFLAGS)
-
-# Application test which runs in obmc env (qemu, real hardware)
-bin_PROGRAMS = logging-test callout-test
-logging_test_SOURCES = logging_test.cpp
-logging_test_LDADD = libphosphor_logging.la
-callout_test_SOURCES = callouts/callout_test.cpp
-
-bin_PROGRAMS += phosphor-log-manager
-
-phosphor_log_manager_SOURCES = \
-	xyz/openbmc_project/Logging/Internal/Manager/server.cpp \
-	log_manager.cpp \
-	log_manager_main.cpp \
-	elog-lookup.cpp \
-	elog_entry.cpp \
-	elog-process-metadata.cpp \
-	elog_meta.cpp \
-	elog_serialize.cpp \
-	sdjournal.cpp \
-	extensions.cpp \
-	util.cpp
-
-# Be sure to build needed files before compiling
-BUILT_SOURCES = \
-	phosphor-logging/elog-errors.hpp \
-	elog-lookup.cpp \
-	elog-process-metadata.cpp \
-	xyz/openbmc_project/Logging/Internal/Manager/server.cpp \
-	xyz/openbmc_project/Logging/Internal/Manager/server.hpp \
-	callouts-gen.hpp
-
-CLEANFILES = \
-	phosphor-logging/elog-errors.hpp \
-	elog-lookup.cpp \
-	elog-process-metadata.cpp \
-	xyz/openbmc_project/Logging/Internal/Manager/server.cpp \
-	xyz/openbmc_project/Logging/Internal/Manager/server.hpp \
-	callouts-gen.hpp
-
-# systemd required for journal interfaces
-logging_test_LDFLAGS = $(SYSTEMD_LIBS) $(SDBUSPLUS_LIBS)
-logging_test_CXXFLAGS = $(SYSTEMD_CFLAGS) $(SDBUSPLUS_CFLAGS)
-callout_test_LDADD = libphosphor_logging.la
-callout_test_LDFLAGS = \
-		$(SDBUSPLUS_LIBS) \
-		$(SYSTEMD_LIBS) \
-		$(PHOSPHOR_DBUS_INTERFACES_LIBS)
-callout_test_CXXFLAGS = \
-		$(SDBUSPLUS_CFLAGS) \
-		$(SYSTEMD_CFLAGS) \
-		$(PHOSPHOR_DBUS_INTERFACES_CFLAGS)
-phosphor_log_manager_LDFLAGS = \
-		$(SYSTEMD_LIBS) \
-		$(SDBUSPLUS_LIBS) \
-		$(PHOSPHOR_DBUS_INTERFACES_LIBS) \
-		$(SDEVENTPLUS_LIBS) \
-		-lstdc++fs
-phosphor_log_manager_CXXFLAGS = \
-		$(SYSTEMD_CFLAGS) \
-		$(SDBUSPLUS_CFLAGS) \
-		$(SDEVENTPLUS_CFLAGS) \
-		$(PHOSPHOR_DBUS_INTERFACES_CFLAGS)
-
-
-include extensions/extensions.mk
-
-
-xyz/openbmc_project/Logging/Internal/Manager/server.cpp: xyz/openbmc_project/Logging/Internal/Manager.interface.yaml xyz/openbmc_project/Logging/Internal/Manager/server.hpp
-	@mkdir -p `dirname $@`
-	$(SDBUSPLUSPLUS) -r $(srcdir) interface server-cpp xyz.openbmc_project.Logging.Internal.Manager > $@
-
-xyz/openbmc_project/Logging/Internal/Manager/server.hpp: xyz/openbmc_project/Logging/Internal/Manager.interface.yaml
-	@mkdir -p `dirname $@`
-	$(SDBUSPLUSPLUS) -r $(srcdir) interface server-header xyz.openbmc_project.Logging.Internal.Manager > $@
-
-ELOG_MAKO ?= elog-gen-template.mako.hpp
-LOOKUP_MAKO ?= elog-lookup-template.mako.cpp
-META_MAKO ?= elog-process-metadata.mako.cpp
-CALLOUTS_MAKO ?= callouts-gen.mako.hpp
-ELOG_TEMPLATE_DIR ?= ${abs_srcdir}/tools/phosphor-logging/templates/
-REQ_FILES_TO_GEN ?= ${abs_srcdir}/tools/elog-gen.py\
-	${ELOG_TEMPLATE_DIR}/$(ELOG_MAKO)\
-	${ELOG_TEMPLATE_DIR}/$(LOOKUP_MAKO)\
-	${ELOG_TEMPLATE_DIR}/$(META_MAKO)\
-	${abs_srcdir}/callouts/callouts.py\
-	${abs_srcdir}/callouts/$(CALLOUTS_MAKO)
-
-# Be sure to package up the required script, yaml, and mako template to
-# generate the header file
-EXTRA_DIST = $(REQ_FILES_TO_GEN)
-
-phosphor-logging/elog-errors.hpp: $(REQ_FILES_TO_GEN)
-	@mkdir -p `dirname $@`
-	$(AM_V_at)$(PYTHON) ${abs_srcdir}/tools/elog-gen.py -y ${YAML_DIR} -u ${YAML_DIR_TEST} -t ${ELOG_TEMPLATE_DIR} -m $(ELOG_MAKO) -o $@
-elog-lookup.cpp: $(REQ_FILES_TO_GEN)
-	$(AM_V_at)$(PYTHON) ${abs_srcdir}/tools/elog-gen.py -y ${YAML_DIR} -u ${YAML_DIR_TEST} -t ${ELOG_TEMPLATE_DIR} -m $(LOOKUP_MAKO) -o $@
-elog-process-metadata.cpp: $(REQ_FILES_TO_GEN)
-	$(AM_V_at)$(PYTHON) ${abs_srcdir}/tools/elog-gen.py -y ${YAML_DIR} -u ${YAML_DIR_TEST} -t ${ELOG_TEMPLATE_DIR} -m $(META_MAKO) -o $@
-callouts-gen.hpp: $(REQ_FILES_TO_GEN)
-	$(AM_V_at)$(PYTHON) ${abs_srcdir}/callouts/callouts.py -i ${CALLOUTS_YAML}
-
-pkgconfiglibdir = ${libdir}/pkgconfig
-pkgconfiglib_DATA = phosphor-logging.pc
-
-SUBDIRS = test phosphor-rsyslog-config
-endif
-# Export elog-gen parser and mako script
-elogdir = ${datadir}/phosphor-logging/elog
-nobase_elog_DATA =  \
-	tools/elog-gen.py \
-	tools/phosphor-logging/templates/elog-gen-template.mako.hpp
-
-# check_PROGRAMS =
-# XFAIL_TESTS =
-# TESTS = $(check_PROGRAMS)
diff --git a/Makefile.am.include b/Makefile.am.include
deleted file mode 100644
index 7037738..0000000
--- a/Makefile.am.include
+++ /dev/null
@@ -1,25 +0,0 @@
-# Ignore system headers
-CODE_COVERAGE_IGNORE_PATTERN = '/include/*' '/usr/include/*' '$(includedir)/*'
-export CODE_COVERAGE_IGNORE_PATTERN
-
-CODE_COVERAGE_LCOV_SHOPTS = $(CODE_COVERAGE_LCOV_SHOPTS_DEFAULT)
-# Use our configuration file for lcov
-CODE_COVERAGE_LCOV_SHOPTS += --config-file $(abs_srcdir)/.lcovrc
-export CODE_COVERAGE_LCOV_SHOPTS
-#
-CODE_COVERAGE_LCOV_OPTIONS = $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
-# Use our configuration file for lcov
-CODE_COVERAGE_LCOV_OPTIONS += --config-file $(abs_srcdir)/.lcovrc
-export CODE_COVERAGE_LCOV_OPTIONS
-
-CODE_COVERAGE_LCOV_RMOPTS = $(CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
-# Use our configuration file for lcov
-CODE_COVERAGE_LCOV_RMOPTS += --config-file $(abs_srcdir)/.lcovrc
-export CODE_COVERAGE_LCOV_RMOPTS
-
-CODE_COVERAGE_GENHTML_OPTIONS = $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
-# Use our configuration file for genhtml
-CODE_COVERAGE_GENHTML_OPTIONS += --config-file $(abs_srcdir)/.lcovrc
-# Don't generate the absolute path for each file in the HTML output
-CODE_COVERAGE_GENHTML_OPTIONS += --prefix $(abs_srcdir) --prefix $(abs_builddir)
-export CODE_COVERAGE_GENHTML_OPTIONS
diff --git a/bootstrap.sh b/bootstrap.sh
deleted file mode 100755
index 6b3c8b9..0000000
--- a/bootstrap.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -xe
-
-AUTOCONF_FILES="Makefile.in aclocal.m4 ar-lib autom4te.cache compile \
-        config.guess config.h.in config.sub configure depcomp install-sh \
-        ltmain.sh missing *libtool test-driver"
-
-case $1 in
-    clean)
-        test -f Makefile && make maintainer-clean
-        for file in ${AUTOCONF_FILES}; do
-            find . -name "$file" -print0 | xargs -0 -r rm -rf
-        done
-        exit 0
-        ;;
-esac
-
-autoreconf -i
-# shellcheck disable=SC2016
-echo 'Run "./configure ${CONFIGURE_FLAGS} && make"'
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 6a73869..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,242 +0,0 @@
-# Initialization
-AC_PREREQ([2.69])
-AC_INIT([phosphor-logging], [1.0], [https://github.com/openbmc/phosphor-logging/issues])
-AC_LANG([C++])
-AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror -Wno-portability foreign dist-xz])
-AM_SILENT_RULES([yes])
-
-# Make sure the default CFLAGS of `-O2 -g` don't override CODE_COVERAGE_CFLAGS
-# It is important that this comes before AC_PROG_C{C,XX}, as we are attempting
-# to stop them from populating default CFLAGS and CXXFLAGS.
-AS_IF([test "x$enable_tests" = "xno"], [enable_code_coverage=no])
-AS_IF([test "x$enable_code_coverage" != "xno"], [
-    AS_IF([test "x${CXXFLAGS+set}" != "xset"], [
-        AC_SUBST(CXXFLAGS, [""])
-    ])
-    AS_IF([test "x${CFLAGS+set}" != "xset"], [
-        AC_SUBST(CFLAGS, [""])
-    ])
-])
-
-# Checks for programs
-AC_PROG_CXX
-AM_PROG_AR
-AC_PROG_INSTALL #Checks/sets the install variable to be used
-AC_PROG_MAKE_SET
-AC_PROG_MKDIR_P
-AC_CHECK_PROG([DIRNAME], dirname, dirname)
-
-# Check for compiler, packages only when install_scripts flag is disabled.
-AC_ARG_ENABLE([install_scripts],
-    AS_HELP_STRING([--enable-install_scripts],
-        [Enable installing parser and mako script]),
-    [], [install_scripts=no])
-AM_CONDITIONAL([INSTALL_SCRIPTS], [test "x$enable_install_scripts" = "xyes"])
-AS_IF([test "x$enable_install_scripts" != "xyes"], [
-    # Checks for typedefs, structures, and compiler characteristics.
-    AX_CXX_COMPILE_STDCXX_17([noext])
-    AX_APPEND_COMPILE_FLAGS([-fpic -Wall -Werror], [CXXFLAGS])
-
-    # Python
-    AM_PATH_PYTHON([3], [AC_SUBST([PYTHON], [echo "$PYTHON"])], [AC_MSG_ERROR(
-        [Could not find python-3 installed...python-3 is required])])
-
-    # Suppress the --with-libtool-sysroot error
-    LT_INIT
-
-    # Checks for libraries.
-    AX_PKG_CHECK_MODULES([SYSTEMD], [], [libsystemd >= 221], [], [AC_MSG_ERROR(["systemd required and not found."])])
-
-    # sdbusplus is non-private because we have no library to link.
-    # If we ever have a library, move this to private.
-    AX_PKG_CHECK_MODULES([SDBUSPLUS], [sdbusplus])
-    AX_PKG_CHECK_MODULES([PHOSPHOR_DBUS_INTERFACES], [phosphor-dbus-interfaces])
-    PKG_CHECK_MODULES([SDEVENTPLUS], [sdeventplus])
-
-    # Check for sdbus++
-    AC_PATH_PROG([SDBUSPLUSPLUS], [sdbus++])
-    AS_IF([test "x$SDBUSPLUSPLUS" == "x"],
-        AC_MSG_ERROR(["Requires sdbus++"]))
-])
-
-# Check/set gtest specific functions.
-AX_PTHREAD([GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=1"],[GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=0"])
-AC_SUBST(GTEST_CPPFLAGS)
-
-# Test cases require SDK so only build if we're told to (and SDK is available)
-AC_ARG_ENABLE([oe-sdk],
-    AS_HELP_STRING([--enable-oe-sdk], [Link testcases absolutely against OE SDK so they can be ran within it.])
-)
-AC_ARG_VAR(OECORE_TARGET_SYSROOT,
-    [Path to the OE SDK SYSROOT])
-AS_IF([test "x$enable_oe_sdk" == "xyes"],
-    AS_IF([test "x$OECORE_TARGET_SYSROOT" == "x"],
-          AC_MSG_ERROR([OECORE_TARGET_SYSROOT must be set with --enable-oe-sdk])
-    )
-    AC_MSG_NOTICE([Enabling OE-SDK at $OECORE_TARGET_SYSROOT])
-    [
-        testcase_flags="-Wl,-rpath,\${OECORE_TARGET_SYSROOT}/lib"
-        testcase_flags="${testcase_flags} -Wl,-rpath,\${OECORE_TARGET_SYSROOT}/usr/lib"
-        testcase_flags="${testcase_flags} -Wl,-dynamic-linker,`find \${OECORE_TARGET_SYSROOT}/lib/ld-*.so | sort -r -n | head -n1`"
-    ]
-    AC_SUBST([OESDK_TESTCASE_FLAGS], [$testcase_flags])
-)
-
-# The continuous integration tests set this.
-# Use it to know where to store logs.
-AC_ARG_ENABLE([tests],
-    AS_HELP_STRING([--enable-tests], [Specifies running in the CI environment])
-)
-
-
-# Check for valgrind
-AS_IF([test "x$enable_tests" = "xno"], [enable_valgrind=no])
-m4_foreach([vgtool], [valgrind_tool_list],
-    [AX_VALGRIND_DFLT(vgtool, [off])])
-AX_VALGRIND_DFLT([memcheck], [on])
-AX_VALGRIND_CHECK
-AM_EXTRA_RECURSIVE_TARGETS([check-valgrind])
-m4_foreach([vgtool], [valgrind_tool_list],
-    [AM_EXTRA_RECURSIVE_TARGETS([check-valgrind-]vgtool)])
-
-# Code coverage
-AX_CODE_COVERAGE
-AS_IF([test "x$CODE_COVERAGE_ENABLED" = "xyes"], [
-    AX_APPEND_COMPILE_FLAGS([-DHAVE_GCOV], [CODE_COVERAGE_CPPFLAGS])
-])
-m4_ifdef([_AX_CODE_COVERAGE_RULES],
-    [AM_CONDITIONAL(AUTOCONF_CODE_COVERAGE_2019_01_06, [true])],
-    [AM_CONDITIONAL(AUTOCONF_CODE_COVERAGE_2019_01_06, [false])])
-AX_ADD_AM_MACRO_STATIC([])
-
-AC_DEFINE(BUSNAME_LOGGING, "xyz.openbmc_project.Logging", [The log manager DBus busname to own.])
-AC_DEFINE(OBJ_LOGGING, "/xyz/openbmc_project/logging", [The log manager DBus object path.])
-AC_DEFINE(OBJ_INTERNAL, "/xyz/openbmc_project/logging/internal/manager", [The private log manager DBus object path.])
-AC_DEFINE(OBJ_ENTRY, "/xyz/openbmc_project/logging/entry", [The log entry DBus object path.])
-AC_DEFINE(INVENTORY_ROOT, "/xyz/openbmc_project/inventory", [The inventory root.])
-AC_DEFINE(CALLOUT_FWD_ASSOCIATION, "callout", [The name of the callout's forward association.])
-AC_DEFINE(CALLOUT_REV_ASSOCIATION, "fault", [The name of the callout's reverse association.])
-AC_DEFINE(BMC_VERSION_FILE, "/etc/os-release", [The file that contains the BMC firmware version])
-AC_DEFINE(FIRST_CEREAL_CLASS_VERSION_WITH_FWLEVEL, "2",
-          [First Cereal class version with the BMC code version persisted])
-
-AC_DEFINE(FIRST_CEREAL_CLASS_VERSION_WITH_UPDATE_TS, "3",
-          [First Cereal class version with the update timestamp persisted])
-
-AC_ARG_VAR(YAML_DIR_TEST, [The path to the test error yaml files.])
-AS_IF([test "x$YAML_DIR_TEST" == "x"], \
-    [YAML_DIR_TEST="${srcdir}/tools/"])
-AC_ARG_VAR(YAML_DIR, [The path to the yaml error files.])
-AS_IF([test "x$YAML_DIR" == "x"], \
-    [YAML_DIR="None"])
-AC_ARG_VAR(CALLOUTS_YAML, [YAML filepath containing generated callouts.])
-AS_IF([test "x$CALLOUTS_YAML" == "x"], \
-    [CALLOUTS_YAML="callouts/callouts-example.yaml"])
-
-AC_ARG_VAR(ERRLOG_PERSIST_PATH, [Path of directory housing persisted errors.])\
-AS_IF([test "x$ERRLOG_PERSIST_PATH" == "x"],
-    AS_IF([test "x$enable_oe_sdk" == "xyes"], \
-        [ERRLOG_PERSIST_PATH="/tmp/errors"])
-    AS_IF([test "x$enable_oe_sdk" == "x"], \
-        [ERRLOG_PERSIST_PATH="/var/lib/phosphor-logging/errors"])
-    AS_IF([test "x$enable_tests" == "xyes"], \
-        [ERRLOG_PERSIST_PATH="/tmp/errors"])
-    AC_DEFINE_UNQUOTED([ERRLOG_PERSIST_PATH], ["$ERRLOG_PERSIST_PATH"], \
-        [Path of directory housing persisted errors])
-)
-
-# Compile error metadata handlers if we're asked to do so.
-AC_ARG_ENABLE([metadata-processing],
-    AS_HELP_STRING([--enable-metadata-processing], [Compile metadata handlers]),
-    [AX_APPEND_COMPILE_FLAGS([-DPROCESS_META], [CXXFLAGS])]
-)
-
-AC_ARG_VAR(ERROR_CAP, [Max number of error entries allowed for commit])
-AS_IF([test "x$ERROR_CAP" == "x"], [ERROR_CAP=200])
-AC_DEFINE_UNQUOTED([ERROR_CAP], [$ERROR_CAP], [Max number of error entries allowed for commit])
-
-AC_ARG_VAR(ERROR_INFO_CAP, [Cap on informational (and below) severity errors])
-AS_IF([test "x$ERROR_INFO_CAP" == "x"], [ERROR_INFO_CAP=10])
-AC_DEFINE_UNQUOTED([ERROR_INFO_CAP], [$ERROR_INFO_CAP], \
-    [Cap on informational (and below) severity errors])
-
-AC_ARG_VAR(CLASS_VERSION, [Class version to register with Cereal])
-AS_IF([test "x$CLASS_VERSION" == "x"], [CLASS_VERSION=3])
-AC_DEFINE_UNQUOTED([CLASS_VERSION], [$CLASS_VERSION], [Class version to register with Cereal])
-
-AC_ARG_VAR(RSYSLOG_SERVER_CONFIG_FILE, \
-    [Path of config file containing server address])
-AS_IF([test "x$RSYSLOG_SERVER_CONFIG_FILE" == "x"], \
-    [RSYSLOG_SERVER_CONFIG_FILE="/etc/rsyslog.d/server.conf"])
-AC_DEFINE_UNQUOTED([RSYSLOG_SERVER_CONFIG_FILE], \
-    ["$RSYSLOG_SERVER_CONFIG_FILE"], \
-    [Path of config file containing server address])
-
-AC_ARG_VAR(BUSNAME_SYSLOG_CONFIG, \
-    [D-Bus busname of syslog config service])
-AS_IF([test "x$BUSNAME_SYSLOG_CONFIG" == "x"], \
-    [BUSNAME_SYSLOG_CONFIG="xyz.openbmc_project.Syslog.Config"])
-AC_DEFINE_UNQUOTED([BUSNAME_SYSLOG_CONFIG], \
-    ["$BUSNAME_SYSLOG_CONFIG"], \
-    [D-Bus busname of syslog config service])
-
-AC_ARG_VAR(BUSPATH_REMOTE_LOGGING_CONFIG, \
-    [D-Bus path of remote logging config object])
-AS_IF([test "x$BUSPATH_REMOTE_LOGGING_CONFIG" == "x"], \
-    [BUSPATH_REMOTE_LOGGING_CONFIG="/xyz/openbmc_project/logging/config/remote"])
-AC_DEFINE_UNQUOTED([BUSPATH_REMOTE_LOGGING_CONFIG], \
-    ["$BUSPATH_REMOTE_LOGGING_CONFIG"], \
-    [D-Bus path of remote logging config object])
-
-AC_DEFINE(SYSTEMD_BUSNAME, "org.freedesktop.systemd1", [systemd busname.])
-AC_DEFINE(SYSTEMD_PATH, "/org/freedesktop/systemd1", [systemd path.])
-AC_DEFINE(SYSTEMD_INTERFACE, "org.freedesktop.systemd1.Manager", [systemd interface.])
-
-AC_ARG_ENABLE([openpower-pel-extension],
-    AS_HELP_STRING([--enable-openpower-pel-extension], [Create PELs])
-)
-
-AC_ARG_VAR(EXTENSION_PERSIST_DIR, [Base directory for extension persistent data])
-AS_IF([test "x$EXTENSION_PERSIST_DIR" == "x"], \
-    [EXTENSION_PERSIST_DIR="/var/lib/phosphor-logging/extensions"])
-AC_DEFINE_UNQUOTED([EXTENSION_PERSIST_DIR], ["$EXTENSION_PERSIST_DIR"], \
-    [Base directory for extension persistent data])
-
-AM_CONDITIONAL([ENABLE_PEL_EXTENSION], [test "x$enable_openpower_pel_extension" == "xyes"])
-
-AS_IF([test "x$enable_openpower_pel_extension" == "xyes"],
-       [AC_CHECK_HEADER(
-            nlohmann/json.hpp,
-            [],
-            [AC_MSG_ERROR([Could not find nlohmann/json.hpp])])
-
-       AX_PKG_CHECK_MODULES([LIBPLDM], [libpldm])
-       PKG_CHECK_MODULES([FMT], [fmt])
-       AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config])
-       AC_ARG_VAR([PKG_CONFIG], [Path to pkg-config])
-       AS_IF([test -z "$PYTHON_INCLUDE"], [
-           AS_IF([test -z "$PKG_CONFIG"], [
-               AC_PATH_PROGS([PKG_CONFIG],
-                             [pkg-config],
-                             [no],
-                             [`dirname $PYTHON`])
-               AS_IF([test "$PKG_CONFIG" = no], [AC_MSG_ERROR([cannot find pkg-config.])])
-           ])
-           AC_MSG_CHECKING([python include flags])
-           PYTHON_INCLUDE=`$PKG_CONFIG --cflags python3`
-           AC_MSG_RESULT([$PYTHON_INCLUDE])
-       ])
-       AX_APPEND_COMPILE_FLAGS([$PYTHON_INCLUDE], [CXXFLAGS])]
-)
-
-AC_ARG_ENABLE([dont-send-pels-to-host],
-              AS_HELP_STRING([--enable-dont-send-pels-to-host],
-                   [Do not send PELs to the host. \
-                    Only applies when PELs are enabled.]),
-    [AX_APPEND_COMPILE_FLAGS([-DDONT_SEND_PELS_TO_HOST])]
-)
-
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile test/Makefile phosphor-rsyslog-config/Makefile])
-AC_CONFIG_FILES([phosphor-logging.pc])
-AC_OUTPUT
diff --git a/extensions/extensions.mk b/extensions/extensions.mk
deleted file mode 100644
index e7648a8..0000000
--- a/extensions/extensions.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-if ENABLE_PEL_EXTENSION
-include extensions/openpower-pels/openpower-pels.mk
-endif
diff --git a/extensions/openpower-pels/openpower-pels.mk b/extensions/openpower-pels/openpower-pels.mk
deleted file mode 100644
index 39b8b0b..0000000
--- a/extensions/openpower-pels/openpower-pels.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-phosphor_log_manager_SOURCES += \
-	extensions/openpower-pels/entry_points.cpp \
-	extensions/openpower-pels/extended_user_data.cpp \
-	extensions/openpower-pels/host_notifier.cpp \
-	extensions/openpower-pels/manager.cpp \
-	extensions/openpower-pels/pldm_interface.cpp \
-	extensions/openpower-pels/repository.cpp \
-	extensions/openpower-pels/src.cpp \
-	extensions/openpower-pels/user_data.cpp
-
-phosphor_log_manager_LDADD = \
-	libpel.la
-
-phosphor_log_manager_LDFLAGS += \
-	$(LIBPLDM_LIBS)
-
-phosphor_log_manager_CFLAGS = \
-	$(LIBPLDM_CFLAGS)
-
-noinst_LTLIBRARIES = libpel.la
-
-libpel_la_SOURCES = \
-	extensions/openpower-pels/ascii_string.cpp \
-	extensions/openpower-pels/bcd_time.cpp \
-	extensions/openpower-pels/callout.cpp \
-	extensions/openpower-pels/callouts.cpp \
-	extensions/openpower-pels/data_interface.cpp \
-	extensions/openpower-pels/device_callouts.cpp \
-	extensions/openpower-pels/extended_user_header.cpp \
-	extensions/openpower-pels/failing_mtms.cpp \
-	extensions/openpower-pels/fru_identity.cpp \
-	extensions/openpower-pels/generic.cpp \
-	extensions/openpower-pels/json_utils.cpp \
-	extensions/openpower-pels/log_id.cpp \
-	extensions/openpower-pels/mru.cpp \
-	extensions/openpower-pels/mtms.cpp \
-	extensions/openpower-pels/paths.cpp \
-	extensions/openpower-pels/pce_identity.cpp \
-	extensions/openpower-pels/pel.cpp \
-	extensions/openpower-pels/pel_rules.cpp \
-	extensions/openpower-pels/pel_values.cpp \
-	extensions/openpower-pels/private_header.cpp \
-	extensions/openpower-pels/registry.cpp \
-	extensions/openpower-pels/section_factory.cpp \
-	extensions/openpower-pels/service_indicators.cpp \
-	extensions/openpower-pels/severity.cpp \
-	extensions/openpower-pels/user_header.cpp
-
-libpel_ldflags =  \
-	$(SYSTEMD_LIBS) \
-	$(PHOSPHOR_LOGGING_LIBS) \
-	$(SDBUSPLUS_LIBS) \
-	$(PHOSPHOR_DBUS_INTERFACES_LIBS) \
-	$(SDEVENTPLUS_LIBS) \
-	$(FMT_LIBS) \
-	-lstdc++fs
-
-libpel_la_LIBADD = $(libpel_ldflags)
-
-libpel_cxx_flags = \
-	$(SYSTEMD_CFLAGS) \
-	$(SDBUSPLUS_CFLAGS) \
-	$(SDEVENTPLUS_CFLAGS) \
-	$(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \
-	-Wno-stringop-truncation
-
-libpel_la_CXXFLAGS = $(libpel_cxx_flags)
-
-registrydir = $(datadir)/phosphor-logging/pels/
-registry_DATA = extensions/openpower-pels/registry/message_registry.json
-
-bin_PROGRAMS += peltool
-
-peltool_SOURCES = \
-	extensions/openpower-pels/extended_user_data.cpp \
-	extensions/openpower-pels/tools/peltool.cpp \
-	extensions/openpower-pels/src.cpp \
-	extensions/openpower-pels/user_data.cpp \
-	extensions/openpower-pels/user_data_json.cpp
-peltool_LDFLAGS = "-lpython$(PYTHON_VERSION)"
-peltool_LDADD = libpel.la
-peltool_CXXFLAGS = "-DPELTOOL"
diff --git a/phosphor-logging.pc.in b/phosphor-logging.pc.in
deleted file mode 100644
index 6ab5119..0000000
--- a/phosphor-logging.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: phosphor-logging
-Description: Phosphor logging utilities
-URL: https://github.com/openbmc/phosphor-logging
-Version: @VERSION@
-Requires: @AX_PACKAGE_REQUIRES@
-Requires.private: @AX_PACKAGE_REQUIRES_PRIVATE@
-Libs: -L@libdir@ -lphosphor_logging
-Cflags: -I@includedir@
diff --git a/phosphor-rsyslog-config/Makefile.am b/phosphor-rsyslog-config/Makefile.am
deleted file mode 100644
index e2890cc..0000000
--- a/phosphor-rsyslog-config/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)
-
-noinst_HEADERS = \
-	utils.hpp \
-	server-conf.hpp
-
-bin_PROGRAMS = phosphor-rsyslog-conf
-
-phosphor_rsyslog_conf_SOURCES = \
-	main.cpp \
-	server-conf.cpp
-
-phosphor_rsyslog_conf_LDADD = \
-	$(top_builddir)/sdjournal.o
-
-phosphor_rsyslog_conf_LDFLAGS = \
-	$(SDBUSPLUS_LIBS) \
-	$(SYSTEMD_LIBS) \
-	$(PHOSPHOR_DBUS_INTERFACES_LIBS)
-
-phosphor_rsyslog_conf_CXXFLAGS = \
-	$(SDBUSPLUS_CFLAGS) \
-	$(SYSTEMD_CFLAGS) \
-	$(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \
-	-flto
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index d054a4c..0000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,149 +0,0 @@
-AM_CPPFLAGS = -I${top_srcdir} \
-	$(CODE_COVERAGE_CPPFLAGS)
-AM_CFLAGS = \
-	$(CODE_COVERAGE_CFLAGS)
-AM_CXXFLAGS = \
-	$(CODE_COVERAGE_CXXFLAGS)
-AM_LDFLAGS = \
-	$(CODE_COVERAGE_LIBS)
-
-TESTS = $(check_PROGRAMS)
-
-check_PROGRAMS = \
-	elog_errorwrap_test \
-	serialization_test_path \
-	serialization_test_properties \
-	remote_logging_test_address \
-	remote_logging_test_port \
-	remote_logging_test_config \
-	sdjournal_mock_test \
-	extensions_test \
-	elog_update_ts_test \
-	elog_quiesce_test
-
-test_cppflags = \
-	-Igtest \
-	$(GTEST_CPPFLAGS) \
-	$(AM_CPPFLAGS) \
-	$(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \
-	$(SDBUSPLUS_CFLAGS) \
-	$(SYSTEMD_CFLAGS) \
-	$(CODE_COVERAGE_CPPFLAGS)
-
-test_cxxflags = \
-	$(PTHREAD_CFLAGS) \
-	$(CODE_COVERAGE_CXXFLAGS)
-
-test_ldflags = \
-	-lgtest_main -lgtest \
-	-lgmock -lstdc++fs \
-	$(PTHREAD_LIBS) \
-	$(OESDK_TESTCASE_FLAGS) \
-	$(PHOSPHOR_DBUS_INTERFACES_LIBS) \
-	$(SDBUSPLUS_LIBS) \
-	$(SDEVENTPLUS_LIBS) \
-	$(SYSTEMD_LIBS) \
-	$(CODE_COVERAGE_LIBS)
-
-test_ldadd = \
-	$(top_builddir)/elog_serialize.o \
-	$(top_builddir)/elog_entry.o \
-	$(top_builddir)/log_manager.o \
-	$(top_builddir)/xyz/openbmc_project/Logging/Internal/Manager/server.o \
-	$(top_builddir)/elog_meta.o \
-	$(top_builddir)/elog-lookup.o \
-	$(top_builddir)/elog-process-metadata.o \
-	$(top_builddir)/sdjournal.o \
-	$(top_builddir)/extensions.o \
-	$(top_builddir)/util.o \
-	$(CODE_COVERAGE_LIBS)
-
-remote_logging_test_ldadd = \
-	$(top_builddir)/phosphor-rsyslog-config/server-conf.o \
-	$(top_builddir)/sdjournal.o \
-	$(CODE_COVERAGE_LIBS)
-
-elog_errorwrap_test_CPPFLAGS = $(test_cppflags)
-elog_errorwrap_test_CXXFLAGS = $(test_cxxflags)
-elog_errorwrap_test_SOURCES = elog_errorwrap_test.cpp
-elog_errorwrap_test_LDADD = $(test_ldadd)
-elog_errorwrap_test_LDFLAGS = \
-	$(test_ldflags)
-
-serialization_test_path_CPPFLAGS = $(test_cppflags)
-serialization_test_path_CXXFLAGS = $(test_cxxflags)
-serialization_test_path_SOURCES = serialization_test_path.cpp
-serialization_test_path_LDADD = $(test_ldadd)
-serialization_test_path_LDFLAGS = \
-	$(test_ldflags)
-
-serialization_test_properties_CPPFLAGS = $(test_cppflags)
-serialization_test_properties_CXXFLAGS = $(test_cxxflags)
-serialization_test_properties_SOURCES = serialization_test_properties.cpp
-serialization_test_properties_LDADD = $(test_ldadd)
-serialization_test_properties_LDFLAGS = \
-	$(test_ldflags)
-
-remote_logging_test_address_CPPFLAGS = $(test_cppflags)
-remote_logging_test_address_CXXFLAGS = $(test_cxxflags)
-remote_logging_test_address_SOURCES = remote_logging_test_address.cpp
-remote_logging_test_address_LDADD = $(remote_logging_test_ldadd)
-remote_logging_test_address_LDFLAGS = \
-	$(test_ldflags)
-
-remote_logging_test_port_CPPFLAGS = $(test_cppflags)
-remote_logging_test_port_CXXFLAGS = $(test_cxxflags)
-remote_logging_test_port_SOURCES = remote_logging_test_port.cpp
-remote_logging_test_port_LDADD = $(remote_logging_test_ldadd)
-remote_logging_test_port_LDFLAGS = \
-	$(test_ldflags)
-
-remote_logging_test_config_CPPFLAGS = $(test_cppflags)
-remote_logging_test_config_CXXFLAGS = $(test_cxxflags)
-remote_logging_test_config_SOURCES = remote_logging_test_config.cpp
-remote_logging_test_config_LDADD = $(remote_logging_test_ldadd)
-remote_logging_test_config_LDFLAGS = \
-	$(test_ldflags)
-
-sdjournal_mock_test_CPPFLAGS = $(test_cppflags)
-sdjournal_mock_test_CXXFLAGS = $(test_cxxflags)
-sdjournal_mock_test_SOURCES = sdtest.cpp
-sdjournal_mock_test_LDADD = $(top_builddir)/sdjournal.o \
-	$(CODE_COVERAGE_LIBS)
-sdjournal_mock_test_LDFLAGS = $(test_ldflags)
-
-extensions_test_CPPFLAGS = $(test_cppflags)
-extensions_test_CXXFLAGS = $(test_cxxflags)
-extensions_test_SOURCES = extensions_test.cpp
-extensions_test_LDADD = \
-	$(top_builddir)/elog_entry.o \
-	$(top_builddir)/elog-lookup.o \
-	$(top_builddir)/elog_meta.o \
-	$(top_builddir)/elog-process-metadata.o \
-	$(top_builddir)/elog_serialize.o \
-	$(top_builddir)/log_manager.o \
-	$(top_builddir)/util.o \
-	$(top_builddir)/xyz/openbmc_project/Logging/Internal/Manager/server.o
-extensions_test_LDFLAGS = $(test_ldflags)
-
-elog_update_ts_test_CPPFLAGS = $(test_cppflags)
-elog_update_ts_test_CXXFLAGS = $(test_cxxflags)
-elog_update_ts_test_SOURCES = elog_update_ts_test.cpp
-elog_update_ts_test_LDADD = $(test_ldadd)
-elog_update_ts_test_LDFLAGS = \
-	$(test_ldflags)
-
-elog_quiesce_test_CPPFLAGS = $(test_cppflags)
-elog_quiesce_test_CXXFLAGS = $(test_cxxflags)
-elog_quiesce_test_SOURCES = elog_quiesce_test.cpp
-elog_quiesce_test_LDADD = $(test_ldadd)
-elog_quiesce_test_LDFLAGS = \
-	$(test_ldflags)
-
-
-# TODO Remove once the test-case failure is resolved openbmc/phosphor-logging#11
-XFAIL_TESTS = elog_errorwrap_test
-
-if ENABLE_PEL_EXTENSION
-include openpower-pels/Makefile.include
-endif
diff --git a/test/openpower-pels/Makefile.include b/test/openpower-pels/Makefile.include
deleted file mode 100644
index d250b77..0000000
--- a/test/openpower-pels/Makefile.include
+++ /dev/null
@@ -1,399 +0,0 @@
-TESTS += $(check_PROGRAMS)
-
-check_PROGRAMS += \
-	additional_data_test \
-	ascii_string_test \
-	bcd_time_test \
-	device_callouts_test \
-	event_logger_test \
-	extended_user_data_test \
-	extended_user_header_test \
-	failing_mtms_test \
-	fru_identity_test \
-	generic_section_test \
-	host_notifier_test \
-	json_utils_test \
-	log_id_test \
-	mru_test \
-	mtms_test \
-	pce_identity_test \
-	pel_manager_test \
-	pel_rules_test \
-	pel_test \
-	pel_values_test \
-	private_header_test \
-	real_pel_test \
-	registry_test \
-	repository_test \
-	section_header_test \
-	service_indicators_test \
-	severity_test \
-	src_test \
-	src_callout_test \
-	src_callouts_test \
-	stream_test \
-	user_data_test \
-	user_header_test
-
-pel_objects = \
-	$(top_builddir)/extensions/openpower-pels/ascii_string.o \
-	$(top_builddir)/extensions/openpower-pels/callout.o \
-	$(top_builddir)/extensions/openpower-pels/callouts.o \
-	$(top_builddir)/extensions/openpower-pels/device_callouts.o \
-	$(top_builddir)/extensions/openpower-pels/extended_user_data.o \
-	$(top_builddir)/extensions/openpower-pels/extended_user_header.o \
-	$(top_builddir)/extensions/openpower-pels/failing_mtms.o \
-	$(top_builddir)/extensions/openpower-pels/fru_identity.o \
-	$(top_builddir)/extensions/openpower-pels/generic.o \
-	$(top_builddir)/extensions/openpower-pels/json_utils.o \
-	$(top_builddir)/extensions/openpower-pels/log_id.o \
-	$(top_builddir)/extensions/openpower-pels/mtms.o \
-	$(top_builddir)/extensions/openpower-pels/mru.o \
-	$(top_builddir)/extensions/openpower-pels/pce_identity.o \
-	$(top_builddir)/extensions/openpower-pels/pel.o \
-	$(top_builddir)/extensions/openpower-pels/pel_rules.o \
-	$(top_builddir)/extensions/openpower-pels/pel_values.o \
-	$(top_builddir)/extensions/openpower-pels/private_header.o \
-	$(top_builddir)/extensions/openpower-pels/registry.o \
-	$(top_builddir)/extensions/openpower-pels/section_factory.o \
-	$(top_builddir)/extensions/openpower-pels/severity.o \
-	$(top_builddir)/extensions/openpower-pels/src.o \
-	$(top_builddir)/extensions/openpower-pels/user_data.o \
-	$(top_builddir)/extensions/openpower-pels/user_header.o \
-	$(FMT_LIBS)
-
-pel_test_utils_ldadd = \
-	$(top_builddir)/extensions/openpower-pels/bcd_time.o \
-	$(top_builddir)/test/openpower-pels/pel_utils.o \
-	$(top_builddir)/test/openpower-pels/paths.o
-
-additional_data_test_SOURCES = %reldir%/additional_data_test.cpp
-additional_data_test_CPPFLAGS = $(test_cppflags)
-additional_data_test_CXXFLAGS = $(test_cxxflags)
-additional_data_test_LDADD = $(test_ldadd)
-additional_data_test_LDFLAGS = $(test_ldflags)
-
-stream_test_SOURCES = %reldir%/stream_test.cpp
-stream_test_CPPFLAGS = $(test_cppflags)
-stream_test_CXXFLAGS = $(test_cxxflags)
-stream_test_LDADD = $(test_ldadd)
-stream_test_LDFLAGS = $(test_ldflags)
-
-bcd_time_test_SOURCES = \
-	%reldir%/bcd_time_test.cpp
-bcd_time_test_CPPFLAGS = $(test_cppflags)
-bcd_time_test_CXXFLAGS = $(test_cxxflags)
-bcd_time_test_LDADD = \
-	$(test_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/bcd_time.o
-bcd_time_test_LDFLAGS = $(test_ldflags)
-
-section_header_test_SOURCES = \
-	%reldir%/section_header_test.cpp
-section_header_test_CPPFLAGS = $(test_cppflags)
-section_header_test_CXXFLAGS = $(test_cxxflags)
-section_header_test_LDADD = $(test_ldadd)
-section_header_test_LDFLAGS = $(test_ldflags)
-
-private_header_test_SOURCES = \
-	%reldir%/private_header_test.cpp
-private_header_test_CPPFLAGS = $(test_cppflags)
-private_header_test_CXXFLAGS = $(test_cxxflags)
-private_header_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_test_utils_ldadd) \
-	$(pel_objects)
-private_header_test_LDFLAGS = $(test_ldflags)
-
-user_header_test_SOURCES = \
-	%reldir%/user_header_test.cpp
-user_header_test_CPPFLAGS = $(test_cppflags)
-user_header_test_CXXFLAGS = $(test_cxxflags)
-user_header_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_test_utils_ldadd) \
-	$(pel_objects)
-user_header_test_LDFLAGS = $(test_ldflags)
-
-log_id_test_SOURCES = \
-	%reldir%/log_id_test.cpp
-log_id_test_CPPFLAGS = $(test_cppflags)
-log_id_test_CXXFLAGS = $(test_cxxflags)
-log_id_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_test_utils_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/log_id.o
-log_id_test_LDFLAGS = $(test_ldflags)
-
-pel_test_SOURCES = \
-	%reldir%/pel_test.cpp
-pel_test_CPPFLAGS = $(test_cppflags)
-pel_test_CXXFLAGS = $(test_cxxflags)
-pel_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_test_utils_ldadd) \
-	$(pel_objects)
-pel_test_LDFLAGS = $(test_ldflags)
-
-real_pel_test_SOURCES = \
-	%reldir%/real_pel_test.cpp
-real_pel_test_CPPFLAGS = $(test_cppflags)
-real_pel_test_CXXFLAGS = $(test_cxxflags)
-real_pel_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_test_utils_ldadd) \
-	$(pel_objects)
-real_pel_test_LDFLAGS = $(test_ldflags)
-
-repository_test_SOURCES = \
-	%reldir%/repository_test.cpp
-repository_test_CPPFLAGS = $(test_cppflags)
-repository_test_CXXFLAGS = $(test_cxxflags)
-repository_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_objects) \
-	$(pel_test_utils_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/repository.o
-repository_test_LDFLAGS = $(test_ldflags)
-
-pel_manager_test_SOURCES = \
-	%reldir%/pel_manager_test.cpp
-pel_manager_test_CPPFLAGS = $(test_cppflags)
-pel_manager_test_CXXFLAGS = \
-	$(test_cxxflags) \
-	$(SDEVENTPLUS_CFLAGS)
-pel_manager_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_objects) \
-	$(pel_test_utils_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/data_interface.o \
-	$(top_builddir)/extensions/openpower-pels/host_notifier.o \
-	$(top_builddir)/extensions/openpower-pels/manager.o \
-	$(top_builddir)/extensions/openpower-pels/repository.o \
-	$(top_builddir)/extensions/openpower-pels/service_indicators.o
-pel_manager_test_LDFLAGS = \
-	$(test_ldflags) \
-	$(SDEVENTPLUS_LIBS)
-
-registry_test_SOURCES = \
-	%reldir%/registry_test.cpp
-registry_test_CPPFLAGS = $(test_cppflags)
-registry_test_CXXFLAGS = $(test_cxxflags)
-registry_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_test_utils_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/registry.o \
-	$(top_builddir)/extensions/openpower-pels/pel_values.o \
-	$(top_builddir)/extensions/openpower-pels/json_utils.o
-registry_test_LDFLAGS = $(test_ldflags)
-
-severity_test_SOURCES = %reldir%/severity_test.cpp
-severity_test_CPPFLAGS = $(test_cppflags)
-severity_test_CXXFLAGS = $(test_cxxflags)
-severity_test_LDADD = \
-	$(test_ldflags) \
-	$(top_builddir)/extensions/openpower-pels/severity.o
-severity_test_LDFLAGS = $(test_ldflags)
-
-mtms_test_SOURCES = %reldir%/mtms_test.cpp
-mtms_test_CPPFLAGS = $(test_cppflags)
-mtms_test_CXXFLAGS = $(test_cxxflags)
-mtms_test_LDADD = \
-	$(test_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/mtms.o
-mtms_test_LDFLAGS = $(test_ldflags)
-
-failing_mtms_test_SOURCES = %reldir%/failing_mtms_test.cpp
-failing_mtms_test_CPPFLAGS = $(test_cppflags)
-failing_mtms_test_CXXFLAGS = $(test_cxxflags)
-failing_mtms_test_LDADD = \
-	$(test_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/failing_mtms.o \
-	$(top_builddir)/extensions/openpower-pels/json_utils.o \
-	$(top_builddir)/extensions/openpower-pels/mtms.o \
-	$(top_builddir)/extensions/openpower-pels/pel_values.o
-failing_mtms_test_LDFLAGS = $(test_ldflags)
-
-pel_values_test_SOURCES = %reldir%/pel_values_test.cpp
-pel_values_test_CPPFLAGS = $(test_cppflags)
-pel_values_test_CXXFLAGS = $(test_cxxflags)
-pel_values_test_LDADD = \
-	$(test_ldflags) \
-	$(top_builddir)/extensions/openpower-pels/pel_values.o
-pel_values_test_LDFLAGS = $(test_ldflags)
-
-generic_section_test_SOURCES = \
-	%reldir%/generic_section_test.cpp
-generic_section_test_CPPFLAGS = $(test_cppflags)
-generic_section_test_CXXFLAGS = $(test_cxxflags)
-generic_section_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_test_utils_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/generic.o
-generic_section_test_LDFLAGS = $(test_ldflags)
-
-user_data_test_SOURCES = \
-	%reldir%/user_data_test.cpp
-user_data_test_CPPFLAGS = $(test_cppflags)
-user_data_test_CXXFLAGS = $(test_cxxflags)
-user_data_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_test_utils_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/user_data.o
-user_data_test_LDFLAGS = $(test_ldflags)
-
-ascii_string_test_SOURCES = %reldir%/ascii_string_test.cpp
-ascii_string_test_CPPFLAGS = $(test_cppflags)
-ascii_string_test_CXXFLAGS = $(test_cxxflags)
-ascii_string_test_LDADD = \
-	$(test_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/ascii_string.o
-ascii_string_test_LDFLAGS = $(test_ldflags)
-
-fru_identity_test_SOURCES = %reldir%/fru_identity_test.cpp
-fru_identity_test_CPPFLAGS = $(test_cppflags)
-fru_identity_test_CXXFLAGS = $(test_cxxflags)
-fru_identity_test_LDADD = \
-	$(test_ldadd) \
-	$(FMT_LIBS) \
-	$(top_builddir)/extensions/openpower-pels/fru_identity.o \
-	$(top_builddir)/extensions/openpower-pels/pel_values.o
-fru_identity_test_LDFLAGS = $(test_ldflags)
-
-pce_identity_test_SOURCES = %reldir%/pce_identity_test.cpp
-pce_identity_test_CPPFLAGS = $(test_cppflags)
-pce_identity_test_CXXFLAGS = $(test_cxxflags)
-pce_identity_test_LDADD = \
-	$(test_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/pce_identity.o \
-	$(top_builddir)/extensions/openpower-pels/mtms.o
-pce_identity_test_LDFLAGS = $(test_ldflags)
-
-mru_test_SOURCES = %reldir%/mru_test.cpp
-mru_test_CPPFLAGS = $(test_cppflags)
-mru_test_CXXFLAGS = $(test_cxxflags)
-mru_test_LDADD = \
-	$(test_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/mru.o
-mru_test_LDFLAGS = $(test_ldflags)
-
-src_callout_test_SOURCES = \
-	%reldir%/src_callout_test.cpp
-src_callout_test_CPPFLAGS = $(test_cppflags)
-src_callout_test_CXXFLAGS = $(test_cxxflags)
-src_callout_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_test_utils_ldadd) \
-	$(FMT_LIBS) \
-	$(top_builddir)/extensions/openpower-pels/callout.o \
-	$(top_builddir)/extensions/openpower-pels/fru_identity.o \
-	$(top_builddir)/extensions/openpower-pels/mru.o \
-	$(top_builddir)/extensions/openpower-pels/mtms.o \
-	$(top_builddir)/extensions/openpower-pels/pce_identity.o \
-	$(top_builddir)/extensions/openpower-pels/pel_values.o
-src_callout_test_LDFLAGS = $(test_ldflags)
-
-src_callouts_test_SOURCES = \
-	%reldir%/src_callouts_test.cpp
-src_callouts_test_CPPFLAGS = $(test_cppflags)
-src_callouts_test_CXXFLAGS = $(test_cxxflags)
-src_callouts_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_test_utils_ldadd) \
-	$(FMT_LIBS) \
-	$(top_builddir)/extensions/openpower-pels/callout.o \
-	$(top_builddir)/extensions/openpower-pels/callouts.o \
-	$(top_builddir)/extensions/openpower-pels/fru_identity.o \
-	$(top_builddir)/extensions/openpower-pels/mru.o \
-	$(top_builddir)/extensions/openpower-pels/mtms.o \
-	$(top_builddir)/extensions/openpower-pels/pce_identity.o \
-	$(top_builddir)/extensions/openpower-pels/pel_values.o
-src_callouts_test_LDFLAGS = $(test_ldflags)
-
-src_test_SOURCES = \
-	%reldir%/src_test.cpp
-src_test_CPPFLAGS = $(test_cppflags)
-src_test_CXXFLAGS = $(test_cxxflags)
-src_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_test_utils_ldadd) \
-	$(pel_objects)
-src_test_LDFLAGS = $(test_ldflags)
-
-extended_user_header_test_SOURCES = \
-	%reldir%/extended_user_header_test.cpp
-extended_user_header_test_CPPFLAGS = $(test_cppflags)
-extended_user_header_test_CXXFLAGS = $(test_cxxflags)
-extended_user_header_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_test_utils_ldadd) \
-	$(pel_objects)
-extended_user_header_test_LDFLAGS = $(test_ldflags)
-
-pel_rules_test_SOURCES = %reldir%/pel_rules_test.cpp
-pel_rules_test_CPPFLAGS = $(test_cppflags)
-pel_rules_test_CXXFLAGS = $(test_cxxflags)
-pel_rules_test_LDADD = \
-	$(test_ldflags) \
-	$(top_builddir)/extensions/openpower-pels/pel_rules.o
-pel_rules_test_LDFLAGS = $(test_ldflags)
-
-host_notifier_test_SOURCES = \
-	%reldir%/host_notifier_test.cpp
-host_notifier_test_CPPFLAGS = $(test_cppflags)
-host_notifier_test_CXXFLAGS = $(test_cxxflags) $(SDEVENTPLUS_CFLAGS)
-host_notifier_test_LDADD = \
-	$(test_ldflags) \
-	$(pel_objects) \
-	$(pel_test_utils_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/host_notifier.o \
-	$(top_builddir)/extensions/openpower-pels/repository.o
-host_notifier_test_LDFLAGS = $(test_ldflags) $(SDEVENTPLUS_LIBS)
-
-json_utils_test_SOURCES = %reldir%/json_utils_test.cpp
-json_utils_test_CPPFLAGS = $(test_cppflags)
-json_utils_test_CXXFLAGS = $(test_cxxflags)
-json_utils_test_LDADD = \
-	$(test_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/json_utils.o
-json_utils_test_LDFLAGS = $(test_ldflags)
-
-event_logger_test_SOURCES = \
-	%reldir%/event_logger_test.cpp
-event_logger_test_CPPFLAGS = $(test_cppflags)
-event_logger_test_CXXFLAGS = $(test_cxxflags) $(SDEVENTPLUS_CFLAGS)
-event_logger_test_LDADD = \
-	$(test_ldadd)
-event_logger_test_LDFLAGS = $(test_ldflags) $(SDEVENTPLUS_LIBS)
-
-device_callouts_test_SOURCES = \
-	%reldir%/device_callouts_test.cpp
-device_callouts_test_CPPFLAGS = $(test_cppflags)
-device_callouts_test_CXXFLAGS = $(test_cxxflags)
-device_callouts_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_test_utils_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/device_callouts.o
-device_callouts_test_LDFLAGS = $(test_ldflags)
-
-service_indicators_test_SOURCES = \
-	%reldir%/service_indicators_test.cpp
-service_indicators_test_CPPFLAGS = $(test_cppflags)
-service_indicators_test_CXXFLAGS = $(test_cxxflags)
-service_indicators_test_LDADD = \
-	$(test_ldflags) \
-	$(pel_objects) \
-	$(pel_test_utils_ldadd) \
-	$(top_builddir)/extensions/openpower-pels/service_indicators.o
-service_indicators_test_LDFLAGS = $(test_ldflags)
-
-extended_user_data_test_SOURCES = \
-	%reldir%/extended_user_data_test.cpp
-extended_user_data_test_CPPFLAGS = $(test_cppflags)
-extended_user_data_test_CXXFLAGS = $(test_cxxflags)
-extended_user_data_test_LDADD = \
-	$(test_ldadd) \
-	$(pel_test_utils_ldadd) \
-	$(FMT_LIBS) \
-	$(top_builddir)/extensions/openpower-pels/extended_user_data.o
-extended_user_data_test_LDFLAGS = $(test_ldflags)