Merge branch 'main-refactor'

diff --cc src/rhgb-client/Makefile.am
index 39c5024aebf1060f522b1c1a96633c973a904cb8,20e6dc74d45916b9665d81071d87e3e67d34e1b8..8cad7df50b08d88ac12237b250794c32a02ddb82
--- 1/src/rhgb-client/Makefile.am
--- 2/src/rhgb-client/Makefile.am
+++ b/src/rhgb-client/Makefile.am
@@@ -1,17 -1,15 +1,16 @@@
- SUBDIRS = tests
  INCLUDES = -I$(top_srcdir)                                                    \
-            -I$(srcdir)/../libply                                              \
-            -I$(srcdir)/..                                                     \
+            -I$(top_srcdir)/src                                                \
+            -I$(top_srcdir)/src/libply                                         \
             -I$(srcdir)
+ rhgb_clientdir = $(bindir)
+ rhgb_client_PROGRAMS = rhgb-client 
  
- bin_PROGRAMS = rhgb-client 
- 
- rhgb_client_CFLAGS = $(PLYMOUTH_CFLAGS)
+ rhgb_client_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLYMOUTH_PLUGIN_PATH=\"$(prefix)/\$${LIB}/plymouth/\"
  rhgb_client_LDADD = $(PLYMOUTH_LIBS) ../libply/libply.la
 -rhgb_client_SOURCES =                                                          \
 -                   ply-boot-client.h                                          \
 -                   ply-boot-client.c                                          \
 -                 rhgb-client.c
 +rhgb_client_SOURCES = \
 +                    $(srcdir)/../ply-boot-protocol.h                        \
 +                      $(srcdir)/ply-boot-client.h                             \
 +                      $(srcdir)/ply-boot-client.c                             \
 +                      $(srcdir)/rhgb-client.c
  
  MAINTAINERCLEANFILES = Makefile.in