summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2008-05-28 22:59:11 -0400
committerRay Strode <rstrode@redhat.com>2008-05-28 23:58:46 -0400
commitd76fcfed45401305fbb728d5bdd708df4364b313 (patch)
tree3aab3144f794cdbc1d637e54b9c437f4ba4ebdcd
parent575be7c81f1939970f74ab8eefcecfa6aed4feb8 (diff)
downloadplymouth-d76fcfed45401305fbb728d5bdd708df4364b313.tar.gz
plymouth-d76fcfed45401305fbb728d5bdd708df4364b313.tar.xz
plymouth-d76fcfed45401305fbb728d5bdd708df4364b313.zip
Rename fedora-fade-in to fade-in
The plugin doesn't need to be distro specific
-rw-r--r--configure.ac2
-rw-r--r--scripts/plymouth.spec12
-rw-r--r--src/splash-plugins/Makefile.am2
-rw-r--r--src/splash-plugins/fade-in/Makefile.am22
-rw-r--r--src/splash-plugins/fade-in/bullet.png (renamed from src/splash-plugins/fedora-fade-in/bullet.png)bin745 -> 745 bytes
-rw-r--r--src/splash-plugins/fade-in/entry.png (renamed from src/splash-plugins/fedora-fade-in/entry.png)bin857 -> 857 bytes
-rw-r--r--src/splash-plugins/fade-in/lock.png (renamed from src/splash-plugins/fedora-fade-in/lock.png)bin29126 -> 29126 bytes
-rw-r--r--src/splash-plugins/fade-in/plugin.c (renamed from src/splash-plugins/fedora-fade-in/plugin.c)0
-rw-r--r--src/splash-plugins/fade-in/star.png (renamed from src/splash-plugins/fedora-fade-in/star.png)bin1057 -> 1057 bytes
-rw-r--r--src/splash-plugins/fedora-fade-in/Makefile.am22
10 files changed, 30 insertions, 30 deletions
diff --git a/configure.ac b/configure.ac
index 6fc3da2..b86f35a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ AC_OUTPUT([Makefile
src/libply/Makefile
src/splash-plugins/Makefile
src/splash-plugins/spinfinity/Makefile
- src/splash-plugins/fedora-fade-in/Makefile
+ src/splash-plugins/fade-in/Makefile
src/splash-plugins/text/Makefile
src/splash-plugins/details/Makefile
src/Makefile
diff --git a/scripts/plymouth.spec b/scripts/plymouth.spec
index 5b37917..494078e 100644
--- a/scripts/plymouth.spec
+++ b/scripts/plymouth.spec
@@ -71,12 +71,12 @@ rm -rf $RPM_BUILD_ROOT
%files plugin-fade-in
%defattr(-, root, root)
-%dir %{_datadir}/plymouth/fedora-fade-in
-%{_datadir}/plymouth/fedora-fade-in/bullet.png
-%{_datadir}/plymouth/fedora-fade-in/entry.png
-%{_datadir}/plymouth/fedora-fade-in/lock.png
-%{_datadir}/plymouth/fedora-fade-in/star.png
-%{_libdir}/plymouth/fedora-fade-in.so
+%dir %{_datadir}/plymouth/fade-in
+%{_datadir}/plymouth/fade-in/bullet.png
+%{_datadir}/plymouth/fade-in/entry.png
+%{_datadir}/plymouth/fade-in/lock.png
+%{_datadir}/plymouth/fade-in/star.png
+%{_libdir}/plymouth/fade-in.so
%files plugin-spinfinity
%defattr(-, root, root)
diff --git a/src/splash-plugins/Makefile.am b/src/splash-plugins/Makefile.am
index e9b876a..89cead9 100644
--- a/src/splash-plugins/Makefile.am
+++ b/src/splash-plugins/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = spinfinity fedora-fade-in text details tests
+SUBDIRS = spinfinity fade-in text details tests
MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/splash-plugins/fade-in/Makefile.am b/src/splash-plugins/fade-in/Makefile.am
new file mode 100644
index 0000000..a52e348
--- /dev/null
+++ b/src/splash-plugins/fade-in/Makefile.am
@@ -0,0 +1,22 @@
+INCLUDES = -I$(top_srcdir) \
+ -I$(srcdir)/../../libply \
+ -I$(srcdir)/../.. \
+ -I$(srcdir)/.. \
+ -I$(srcdir)
+
+plugindir = $(libdir)/plymouth
+plugin_LTLIBRARIES = fade-in.la
+
+fade_in_la_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLYMOUTH_IMAGE_DIR=\"$(datadir)/plymouth/\"
+fade_in_la_LDFLAGS = -module -avoid-version -export-dynamic
+fade_in_la_LIBADD = $(PLYMOUTH_LIBS) ../../libply/libply.la
+fade_in_la_SOURCES = $(srcdir)/../../ply-boot-splash-plugin.h \
+ $(srcdir)/../../ply-window.h \
+ $(srcdir)/../../ply-window.c \
+ $(srcdir)/plugin.c
+
+plymouthdir = $(datadir)/plymouth/fade-in
+plymouth_DATA = star.png bullet.png entry.png lock.png
+
+EXTRA_DIST = $(plymouth_DATA)
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/splash-plugins/fedora-fade-in/bullet.png b/src/splash-plugins/fade-in/bullet.png
index 691fb80..691fb80 100644
--- a/src/splash-plugins/fedora-fade-in/bullet.png
+++ b/src/splash-plugins/fade-in/bullet.png
Binary files differ
diff --git a/src/splash-plugins/fedora-fade-in/entry.png b/src/splash-plugins/fade-in/entry.png
index 450afb1..450afb1 100644
--- a/src/splash-plugins/fedora-fade-in/entry.png
+++ b/src/splash-plugins/fade-in/entry.png
Binary files differ
diff --git a/src/splash-plugins/fedora-fade-in/lock.png b/src/splash-plugins/fade-in/lock.png
index 7ddd375..7ddd375 100644
--- a/src/splash-plugins/fedora-fade-in/lock.png
+++ b/src/splash-plugins/fade-in/lock.png
Binary files differ
diff --git a/src/splash-plugins/fedora-fade-in/plugin.c b/src/splash-plugins/fade-in/plugin.c
index 2432fb2..2432fb2 100644
--- a/src/splash-plugins/fedora-fade-in/plugin.c
+++ b/src/splash-plugins/fade-in/plugin.c
diff --git a/src/splash-plugins/fedora-fade-in/star.png b/src/splash-plugins/fade-in/star.png
index 8d175ca..8d175ca 100644
--- a/src/splash-plugins/fedora-fade-in/star.png
+++ b/src/splash-plugins/fade-in/star.png
Binary files differ
diff --git a/src/splash-plugins/fedora-fade-in/Makefile.am b/src/splash-plugins/fedora-fade-in/Makefile.am
deleted file mode 100644
index ec4c09f..0000000
--- a/src/splash-plugins/fedora-fade-in/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-INCLUDES = -I$(top_srcdir) \
- -I$(srcdir)/../../libply \
- -I$(srcdir)/../.. \
- -I$(srcdir)/.. \
- -I$(srcdir)
-
-plugindir = $(libdir)/plymouth
-plugin_LTLIBRARIES = fedora-fade-in.la
-
-fedora_fade_in_la_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLYMOUTH_IMAGE_DIR=\"$(datadir)/plymouth/\"
-fedora_fade_in_la_LDFLAGS = -module -avoid-version -export-dynamic
-fedora_fade_in_la_LIBADD = $(PLYMOUTH_LIBS) ../../libply/libply.la
-fedora_fade_in_la_SOURCES = $(srcdir)/../../ply-boot-splash-plugin.h \
- $(srcdir)/../../ply-window.h \
- $(srcdir)/../../ply-window.c \
- $(srcdir)/plugin.c
-
-plymouthdir = $(datadir)/plymouth/fedora-fade-in
-plymouth_DATA = star.png bullet.png entry.png lock.png
-
-EXTRA_DIST = $(plymouth_DATA)
-MAINTAINERCLEANFILES = Makefile.in