Move splash-plugins to plugins/splash

We're going to have non-splash plugins shortly.

diff --git a/configure.ac b/configure.ac
index ed87ef0a963d13b0ced71af2112e0d2f061c786c..70d05cab27c2b703e8995d421c21b7abe01dce4e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -90,11 +90,12 @@ AC_OUTPUT([Makefile
            src/libply/Makefile
            src/libplybootsplash/Makefile
            src/plymouth-1.pc
-           src/splash-plugins/Makefile
-           src/splash-plugins/spinfinity/Makefile
-           src/splash-plugins/fade-in/Makefile
-           src/splash-plugins/text/Makefile
-           src/splash-plugins/details/Makefile
+           src/plugins/Makefile
+           src/plugins/splash/Makefile
+           src/plugins/splash/spinfinity/Makefile
+           src/plugins/splash/fade-in/Makefile
+           src/plugins/splash/text/Makefile
+           src/plugins/splash/details/Makefile
            src/Makefile
            src/client/Makefile
            src/viewer/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index 811a7a1fc2940575cba3a2f38b53a09748f722fa..8857487007fd5ce093fd6a3d4029ed55327f78ad 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libply libplybootsplash . splash-plugins client viewer tests
+SUBDIRS = libply libplybootsplash . plugins client viewer tests
 INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)/libply                                                 \
            -I$(srcdir)/libplybootsplash                                       \

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
new file mode 100644 (file)
index 0000000..2f35250
--- /dev/null
+++ b/src/plugins/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = splash
+
+MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/splash-plugins/Makefile.am b/src/plugins/splash/Makefile.am
similarity index 100%
rename from src/splash-plugins/Makefile.am
rename to src/plugins/splash/Makefile.am

diff --git a/src/splash-plugins/details/Makefile.am b/src/plugins/splash/details/Makefile.am
similarity index 65%
rename from src/splash-plugins/details/Makefile.am
rename to src/plugins/splash/details/Makefile.am
index 9995b7a8504767d144bd6de1eda0312cba307282..bdf6d5887bd1d65bb5b4bcbaca2de629bcbb7fc4 100644 (file)
--- a/src/splash-plugins/details/Makefile.am
+++ b/src/plugins/splash/details/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = -I$(top_srcdir)                                                    \
-           -I$(srcdir)/../../libply                                           \
-           -I$(srcdir)/../../libplybootsplash                                 \
+           -I$(srcdir)/../../../libply                                        \
+           -I$(srcdir)/../../../libplybootsplash                              \
+           -I$(srcdir)/../../..                                               \
            -I$(srcdir)/../..                                                  \
            -I$(srcdir)/..                                                     \
            -I$(srcdir)
@@ -11,8 +12,8 @@ plugin_LTLIBRARIES = details.la
 details_la_CFLAGS = $(PLYMOUTH_CFLAGS)
 details_la_LDFLAGS = -module -avoid-version -export-dynamic
 details_la_LIBADD = $(PLYMOUTH_LIBS)                                         \
-                    ../../libply/libply.la                                   \
-                    ../../libplybootsplash/libplybootsplash.la
+                    ../../../libply/libply.la                                \
+                    ../../../libplybootsplash/libplybootsplash.la
 details_la_SOURCES = $(srcdir)/plugin.c
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/splash-plugins/details/plugin.c b/src/plugins/splash/details/plugin.c
similarity index 100%
rename from src/splash-plugins/details/plugin.c
rename to src/plugins/splash/details/plugin.c

diff --git a/src/splash-plugins/fade-in/Makefile.am b/src/plugins/splash/fade-in/Makefile.am
similarity index 78%
rename from src/splash-plugins/fade-in/Makefile.am
rename to src/plugins/splash/fade-in/Makefile.am
index ab823da7f46b96a7919efc2deab22b7ac1f91920..85256d0a3d789b641899d4e57416bc593f682065 100644 (file)
--- a/src/splash-plugins/fade-in/Makefile.am
+++ b/src/plugins/splash/fade-in/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = -I$(top_srcdir)                                                    \
-           -I$(srcdir)/../../libply                                           \
-           -I$(srcdir)/../../libplybootsplash                                 \
+           -I$(srcdir)/../../../libply                                        \
+           -I$(srcdir)/../../../libplybootsplash                              \
+           -I$(srcdir)/../../..                                               \
            -I$(srcdir)/../..                                                  \
            -I$(srcdir)/..                                                     \
            -I$(srcdir)
@@ -16,8 +17,8 @@ fade_in_la_CFLAGS = $(PLYMOUTH_CFLAGS)                                        \
                     -DPLYMOUTH_BACKGROUND_START_COLOR=$(background_start_color)
 fade_in_la_LDFLAGS = -module -avoid-version -export-dynamic
 fade_in_la_LIBADD = $(PLYMOUTH_LIBS)                                          \
-                    ../../libply/libply.la                                    \
-                    ../../libplybootsplash/libplybootsplash.la
+                    ../../../libply/libply.la                                 \
+                    ../../../libplybootsplash/libplybootsplash.la
 fade_in_la_SOURCES = $(srcdir)/plugin.c
 
 plymouthdir = $(datadir)/plymouth/fade-in

diff --git a/src/splash-plugins/fade-in/bullet.png b/src/plugins/splash/fade-in/bullet.png
similarity index 100%
rename from src/splash-plugins/fade-in/bullet.png
rename to src/plugins/splash/fade-in/bullet.png

diff --git a/src/splash-plugins/fade-in/entry.png b/src/plugins/splash/fade-in/entry.png
similarity index 100%
rename from src/splash-plugins/fade-in/entry.png
rename to src/plugins/splash/fade-in/entry.png

diff --git a/src/splash-plugins/fade-in/lock.png b/src/plugins/splash/fade-in/lock.png
similarity index 100%
rename from src/splash-plugins/fade-in/lock.png
rename to src/plugins/splash/fade-in/lock.png

diff --git a/src/splash-plugins/fade-in/plugin.c b/src/plugins/splash/fade-in/plugin.c
similarity index 100%
rename from src/splash-plugins/fade-in/plugin.c
rename to src/plugins/splash/fade-in/plugin.c

diff --git a/src/splash-plugins/fade-in/star.png b/src/plugins/splash/fade-in/star.png
similarity index 100%
rename from src/splash-plugins/fade-in/star.png
rename to src/plugins/splash/fade-in/star.png

diff --git a/src/splash-plugins/spinfinity/Makefile.am b/src/plugins/splash/spinfinity/Makefile.am
similarity index 92%
rename from src/splash-plugins/spinfinity/Makefile.am
rename to src/plugins/splash/spinfinity/Makefile.am
index 31fd196217d9f81952f0132cbeee9033adcfedba..195ca3e57e4f1819da75e5a9218288c716442cc0 100644 (file)
--- a/src/splash-plugins/spinfinity/Makefile.am
+++ b/src/plugins/splash/spinfinity/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = -I$(top_srcdir)                                                    \
-           -I$(srcdir)/../../libply                                           \
-           -I$(srcdir)/../../libplybootsplash                                 \
+           -I$(srcdir)/../../../libply                                        \
+           -I$(srcdir)/../../../libplybootsplash                              \
+           -I$(srcdir)/../../..                                               \
            -I$(srcdir)/../..                                                  \
            -I$(srcdir)/..                                                     \
            -I$(srcdir)
@@ -17,8 +18,8 @@ spinfinity_la_CFLAGS = $(PLYMOUTH_CFLAGS)                                    \
 
 spinfinity_la_LDFLAGS = -module -avoid-version -export-dynamic
 spinfinity_la_LIBADD = $(PLYMOUTH_LIBS)                                      \
-                       ../../libply/libply.la                                \
-                       ../../libplybootsplash/libplybootsplash.la
+                       ../../../libply/libply.la                             \
+                       ../../../libplybootsplash/libplybootsplash.la
 spinfinity_la_SOURCES = $(srcdir)/plugin.c
 
 throbber_frames =                                                            \

diff --git a/src/splash-plugins/spinfinity/box.png b/src/plugins/splash/spinfinity/box.png
similarity index 100%
rename from src/splash-plugins/spinfinity/box.png
rename to src/plugins/splash/spinfinity/box.png

diff --git a/src/splash-plugins/spinfinity/bullet.png b/src/plugins/splash/spinfinity/bullet.png
similarity index 100%
rename from src/splash-plugins/spinfinity/bullet.png
rename to src/plugins/splash/spinfinity/bullet.png

diff --git a/src/splash-plugins/spinfinity/entry.png b/src/plugins/splash/spinfinity/entry.png
similarity index 100%
rename from src/splash-plugins/spinfinity/entry.png
rename to src/plugins/splash/spinfinity/entry.png

diff --git a/src/splash-plugins/spinfinity/lock.png b/src/plugins/splash/spinfinity/lock.png
similarity index 100%
rename from src/splash-plugins/spinfinity/lock.png
rename to src/plugins/splash/spinfinity/lock.png

diff --git a/src/splash-plugins/spinfinity/plugin.c b/src/plugins/splash/spinfinity/plugin.c
similarity index 100%
rename from src/splash-plugins/spinfinity/plugin.c
rename to src/plugins/splash/spinfinity/plugin.c

diff --git a/src/splash-plugins/spinfinity/throbber-00.png b/src/plugins/splash/spinfinity/throbber-00.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-00.png
rename to src/plugins/splash/spinfinity/throbber-00.png

diff --git a/src/splash-plugins/spinfinity/throbber-01.png b/src/plugins/splash/spinfinity/throbber-01.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-01.png
rename to src/plugins/splash/spinfinity/throbber-01.png

diff --git a/src/splash-plugins/spinfinity/throbber-02.png b/src/plugins/splash/spinfinity/throbber-02.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-02.png
rename to src/plugins/splash/spinfinity/throbber-02.png

diff --git a/src/splash-plugins/spinfinity/throbber-03.png b/src/plugins/splash/spinfinity/throbber-03.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-03.png
rename to src/plugins/splash/spinfinity/throbber-03.png

diff --git a/src/splash-plugins/spinfinity/throbber-04.png b/src/plugins/splash/spinfinity/throbber-04.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-04.png
rename to src/plugins/splash/spinfinity/throbber-04.png

diff --git a/src/splash-plugins/spinfinity/throbber-05.png b/src/plugins/splash/spinfinity/throbber-05.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-05.png
rename to src/plugins/splash/spinfinity/throbber-05.png

diff --git a/src/splash-plugins/spinfinity/throbber-06.png b/src/plugins/splash/spinfinity/throbber-06.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-06.png
rename to src/plugins/splash/spinfinity/throbber-06.png

diff --git a/src/splash-plugins/spinfinity/throbber-07.png b/src/plugins/splash/spinfinity/throbber-07.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-07.png
rename to src/plugins/splash/spinfinity/throbber-07.png

diff --git a/src/splash-plugins/spinfinity/throbber-08.png b/src/plugins/splash/spinfinity/throbber-08.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-08.png
rename to src/plugins/splash/spinfinity/throbber-08.png

diff --git a/src/splash-plugins/spinfinity/throbber-09.png b/src/plugins/splash/spinfinity/throbber-09.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-09.png
rename to src/plugins/splash/spinfinity/throbber-09.png

diff --git a/src/splash-plugins/spinfinity/throbber-10.png b/src/plugins/splash/spinfinity/throbber-10.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-10.png
rename to src/plugins/splash/spinfinity/throbber-10.png

diff --git a/src/splash-plugins/spinfinity/throbber-11.png b/src/plugins/splash/spinfinity/throbber-11.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-11.png
rename to src/plugins/splash/spinfinity/throbber-11.png

diff --git a/src/splash-plugins/spinfinity/throbber-12.png b/src/plugins/splash/spinfinity/throbber-12.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-12.png
rename to src/plugins/splash/spinfinity/throbber-12.png

diff --git a/src/splash-plugins/spinfinity/throbber-13.png b/src/plugins/splash/spinfinity/throbber-13.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-13.png
rename to src/plugins/splash/spinfinity/throbber-13.png

diff --git a/src/splash-plugins/spinfinity/throbber-14.png b/src/plugins/splash/spinfinity/throbber-14.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-14.png
rename to src/plugins/splash/spinfinity/throbber-14.png

diff --git a/src/splash-plugins/spinfinity/throbber-15.png b/src/plugins/splash/spinfinity/throbber-15.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-15.png
rename to src/plugins/splash/spinfinity/throbber-15.png

diff --git a/src/splash-plugins/spinfinity/throbber-16.png b/src/plugins/splash/spinfinity/throbber-16.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-16.png
rename to src/plugins/splash/spinfinity/throbber-16.png

diff --git a/src/splash-plugins/spinfinity/throbber-17.png b/src/plugins/splash/spinfinity/throbber-17.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-17.png
rename to src/plugins/splash/spinfinity/throbber-17.png

diff --git a/src/splash-plugins/spinfinity/throbber-18.png b/src/plugins/splash/spinfinity/throbber-18.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-18.png
rename to src/plugins/splash/spinfinity/throbber-18.png

diff --git a/src/splash-plugins/spinfinity/throbber-19.png b/src/plugins/splash/spinfinity/throbber-19.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-19.png
rename to src/plugins/splash/spinfinity/throbber-19.png

diff --git a/src/splash-plugins/spinfinity/throbber-20.png b/src/plugins/splash/spinfinity/throbber-20.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-20.png
rename to src/plugins/splash/spinfinity/throbber-20.png

diff --git a/src/splash-plugins/spinfinity/throbber-21.png b/src/plugins/splash/spinfinity/throbber-21.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-21.png
rename to src/plugins/splash/spinfinity/throbber-21.png

diff --git a/src/splash-plugins/spinfinity/throbber-22.png b/src/plugins/splash/spinfinity/throbber-22.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-22.png
rename to src/plugins/splash/spinfinity/throbber-22.png

diff --git a/src/splash-plugins/spinfinity/throbber-23.png b/src/plugins/splash/spinfinity/throbber-23.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-23.png
rename to src/plugins/splash/spinfinity/throbber-23.png

diff --git a/src/splash-plugins/spinfinity/throbber-24.png b/src/plugins/splash/spinfinity/throbber-24.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-24.png
rename to src/plugins/splash/spinfinity/throbber-24.png

diff --git a/src/splash-plugins/spinfinity/throbber-25.png b/src/plugins/splash/spinfinity/throbber-25.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-25.png
rename to src/plugins/splash/spinfinity/throbber-25.png

diff --git a/src/splash-plugins/spinfinity/throbber-26.png b/src/plugins/splash/spinfinity/throbber-26.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-26.png
rename to src/plugins/splash/spinfinity/throbber-26.png

diff --git a/src/splash-plugins/spinfinity/throbber-27.png b/src/plugins/splash/spinfinity/throbber-27.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-27.png
rename to src/plugins/splash/spinfinity/throbber-27.png

diff --git a/src/splash-plugins/spinfinity/throbber-28.png b/src/plugins/splash/spinfinity/throbber-28.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-28.png
rename to src/plugins/splash/spinfinity/throbber-28.png

diff --git a/src/splash-plugins/spinfinity/throbber-29.png b/src/plugins/splash/spinfinity/throbber-29.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-29.png
rename to src/plugins/splash/spinfinity/throbber-29.png

diff --git a/src/splash-plugins/spinfinity/throbber-30.png b/src/plugins/splash/spinfinity/throbber-30.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-30.png
rename to src/plugins/splash/spinfinity/throbber-30.png

diff --git a/src/splash-plugins/spinfinity/throbber-31.png b/src/plugins/splash/spinfinity/throbber-31.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-31.png
rename to src/plugins/splash/spinfinity/throbber-31.png

diff --git a/src/splash-plugins/spinfinity/throbber-32.png b/src/plugins/splash/spinfinity/throbber-32.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-32.png
rename to src/plugins/splash/spinfinity/throbber-32.png

diff --git a/src/splash-plugins/spinfinity/throbber-33.png b/src/plugins/splash/spinfinity/throbber-33.png
similarity index 100%
rename from src/splash-plugins/spinfinity/throbber-33.png
rename to src/plugins/splash/spinfinity/throbber-33.png

diff --git a/src/splash-plugins/text/Makefile.am b/src/plugins/splash/text/Makefile.am
similarity index 71%
rename from src/splash-plugins/text/Makefile.am
rename to src/plugins/splash/text/Makefile.am
index ccf8093dc4e056cefc44e40c5abab849ff69dd14..2a20f0dbdcfa95ae440981801d7fdcbef3db932c 100644 (file)
--- a/src/splash-plugins/text/Makefile.am
+++ b/src/plugins/splash/text/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = -I$(top_srcdir)                                                    \
-           -I$(srcdir)/../../libply                                           \
-           -I$(srcdir)/../../libplybootsplash                                 \
+           -I$(srcdir)/../../../libply                                        \
+           -I$(srcdir)/../../../libplybootsplash                              \
+           -I$(srcdir)/../../..                                               \
            -I$(srcdir)/../..                                                  \
            -I$(srcdir)/..                                                     \
            -I$(srcdir)
@@ -15,8 +16,8 @@ text_la_CFLAGS = $(PLYMOUTH_CFLAGS)                                           \
 
 text_la_LDFLAGS = -module -avoid-version -export-dynamic
 text_la_LIBADD = $(PLYMOUTH_LIBS)                                            \
-                   ../../libply/libply.la                                   \
-                   ../../libplybootsplash/libplybootsplash.la
+                 ../../../libply/libply.la                                   \
+                 ../../../libplybootsplash/libplybootsplash.la
 text_la_SOURCES = $(srcdir)/plugin.c
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/splash-plugins/text/plugin.c b/src/plugins/splash/text/plugin.c
similarity index 100%
rename from src/splash-plugins/text/plugin.c
rename to src/plugins/splash/text/plugin.c