diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rwxr-xr-x | scripts/plymouth-update-initrd | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/client/Makefile.am | 22 | ||||
| -rw-r--r-- | src/client/ply-boot-client.c (renamed from src/rhgb-client/ply-boot-client.c) | 0 | ||||
| -rw-r--r-- | src/client/ply-boot-client.h (renamed from src/rhgb-client/ply-boot-client.h) | 0 | ||||
| -rw-r--r-- | src/client/plymouth.c (renamed from src/rhgb-client/rhgb-client.c) | 0 | ||||
| -rw-r--r-- | src/client/tests/Makefile.am (renamed from src/rhgb-client/tests/Makefile.am) | 0 | ||||
| -rw-r--r-- | src/client/tests/ply-boot-client-test.am (renamed from src/rhgb-client/tests/ply-boot-client-test.am) | 0 | ||||
| -rw-r--r-- | src/rhgb-client/Makefile.am | 16 |
10 files changed, 27 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index 71c6fb1..d1d8bf5 100644 --- 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 01e1b69..bb3343a 100755 --- 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 bfdd1c1..3211fdc 100644 --- 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 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 index 08eb6b9..08eb6b9 100644 --- a/src/rhgb-client/ply-boot-client.c +++ b/src/client/ply-boot-client.c diff --git a/src/rhgb-client/ply-boot-client.h b/src/client/ply-boot-client.h index 4c72db2..4c72db2 100644 --- a/src/rhgb-client/ply-boot-client.h +++ b/src/client/ply-boot-client.h diff --git a/src/rhgb-client/rhgb-client.c b/src/client/plymouth.c index 048563d..048563d 100644 --- a/src/rhgb-client/rhgb-client.c +++ b/src/client/plymouth.c diff --git a/src/rhgb-client/tests/Makefile.am b/src/client/tests/Makefile.am index c6dbfdb..c6dbfdb 100644 --- a/src/rhgb-client/tests/Makefile.am +++ b/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 index f733032..f733032 100644 --- a/src/rhgb-client/tests/ply-boot-client-test.am +++ b/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 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 |