rename rhgb-client to plymouth

We'll keep a compat symlink in place until init scripts are moved over

diff --git a/configure.ac b/configure.ac
index 71c6fb1d6429bb58f2732724d29bd23dba9fae5a..d1d8bf58f91cbde8acd07f0d90606c58a2bb31db 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -49,10 +49,10 @@ AC_OUTPUT([Makefile
            src/splash-plugins/text/Makefile
            src/splash-plugins/details/Makefile
            src/Makefile
-           src/rhgb-client/Makefile
+           src/client/Makefile
            src/tests/Makefile
            src/libply/tests/Makefile
-           src/rhgb-client/tests/Makefile
+           src/client/tests/Makefile
            src/splash-plugins/tests/Makefile
           scripts/Makefile
 ])

diff --git a/scripts/plymouth-update-initrd b/scripts/plymouth-update-initrd
index 01e1b6999e7fa55bd26b2e562f380e98cf0681a3..bb3343aa2023a23b9758c007120d0cc0945140b7 100755 (executable)
--- a/scripts/plymouth-update-initrd
+++ b/scripts/plymouth-update-initrd
@@ -31,7 +31,7 @@ TMPDIR="$(mktemp -d $PWD/initrd.XXXXXXXXXX)"
 (cd $TMPDIR
     zcat $INITRD | cpio --quiet -Hnewc -i --make-directories
     sed -i -e 's@^#!\(.*\)@#!/bin/plymouthd \1\n@' init 
-    #sed -i -e 's@setquiet@&\n/bin/rhgb-client --ask-for-password@' init 
+    #sed -i -e 's@setquiet@&\n/bin/plymouth --ask-for-password@' init
     (cd $LIBDIR
         DEPS=$(get_lib_deps ${LIBEXECDIR}/plymouth/plymouth ${LIBDIR}/plymouth/fedora-fade-in.so ${LIBDIR}/plymouth/text.so ${LIBDIR}/plymouth/details.so)
         for dep in $DEPS; do
@@ -42,7 +42,7 @@ TMPDIR="$(mktemp -d $PWD/initrd.XXXXXXXXXX)"
     /sbin/ldconfig -n .${LIBDIR}
 
     install -m755 ${LIBEXECDIR}/plymouth/plymouthd bin
-    install -m755 ${BINDIR}/rhgb-client bin
+    install -m755 ${BINDIR}/plymouth bin
 
     mkdir -p ${TMPDIR}$DATADIR/plymouth
 

diff --git a/src/Makefile.am b/src/Makefile.am
index bfdd1c1b3b31352ef1623416500425c06dbfe579..3211fdcedf9fda7654f0b944899f184bb41dd06e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libply . splash-plugins rhgb-client tests
+SUBDIRS = libply . splash-plugins client tests
 INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)/libply                                                 \
            -I$(srcdir)

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
new file mode 100644 (file)
index 0000000..a0f20ee
--- /dev/null
+++ b/src/client/Makefile.am
@@ -0,0 +1,22 @@
+INCLUDES = -I$(top_srcdir)                                                    \
+           -I$(top_srcdir)/src                                                \
+           -I$(top_srcdir)/src/libply                                         \
+           -I$(srcdir)
+plymouthdir = $(bindir)
+plymouth_PROGRAMS = plymouth
+
+plymouth_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLYMOUTH_PLUGIN_PATH=\"$(prefix)/\$${LIB}/plymouth/\"
+plymouth_LDADD = $(PLYMOUTH_LIBS) ../libply/libply.la
+plymouth_SOURCES = \
+                      $(srcdir)/../ply-boot-protocol.h                        \
+                      $(srcdir)/ply-boot-client.h                             \
+                      $(srcdir)/ply-boot-client.c                             \
+                      $(srcdir)/plymouth.c
+
+install-data-hook:
+       (cd $(DESTDIR)$(plymouthdir); ln -s plymouth rhgb-client)
+
+uninstall-hook:
+       rm -f $(DESTDIR)$(plymouthdir)/rhgb-client
+
+MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/rhgb-client/ply-boot-client.c b/src/client/ply-boot-client.c
similarity index 100%
rename from src/rhgb-client/ply-boot-client.c
rename to src/client/ply-boot-client.c

diff --git a/src/rhgb-client/ply-boot-client.h b/src/client/ply-boot-client.h
similarity index 100%
rename from src/rhgb-client/ply-boot-client.h
rename to src/client/ply-boot-client.h

diff --git a/src/rhgb-client/rhgb-client.c b/src/client/plymouth.c
similarity index 100%
rename from src/rhgb-client/rhgb-client.c
rename to src/client/plymouth.c

diff --git a/src/rhgb-client/tests/Makefile.am b/src/client/tests/Makefile.am
similarity index 100%
rename from src/rhgb-client/tests/Makefile.am
rename to src/client/tests/Makefile.am

diff --git a/src/rhgb-client/tests/ply-boot-client-test.am b/src/client/tests/ply-boot-client-test.am
similarity index 100%
rename from src/rhgb-client/tests/ply-boot-client-test.am
rename to src/client/tests/ply-boot-client-test.am

diff --git a/src/rhgb-client/Makefile.am b/src/rhgb-client/Makefile.am
deleted file mode 100644 (file)
index 8cad7df..0000000
--- a/src/rhgb-client/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-INCLUDES = -I$(top_srcdir)                                                    \
-           -I$(top_srcdir)/src                                                \
-           -I$(top_srcdir)/src/libply                                         \
-           -I$(srcdir)
-rhgb_clientdir = $(bindir)
-rhgb_client_PROGRAMS = rhgb-client 
-
-rhgb_client_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLYMOUTH_PLUGIN_PATH=\"$(prefix)/\$${LIB}/plymouth/\"
-rhgb_client_LDADD = $(PLYMOUTH_LIBS) ../libply/libply.la
-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