[splash] Split out graphical parts of libply-splash-core

We now have a libply-splash-graphics for handling the
graphical bits.  In particular, this means plymouthd no
longer links against libpng.

diff --git a/configure.ac b/configure.ac
index a859b5005c7ad71dac358dcbb7bdb211d836acef..6ecb6281172606e312e9057188322364b9d8b6fc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -211,7 +211,9 @@ AS_AC_EXPAND(PLYMOUTH_PLUGIN_PATH, $plymouthplugindir)
 AC_OUTPUT([Makefile
            src/libply/Makefile
            src/libply-splash-core/Makefile
+           src/libply-splash-graphics/Makefile
            src/ply-splash-core.pc
+           src/ply-splash-graphics.pc
            src/plugins/Makefile
            src/plugins/renderers/Makefile
            src/plugins/renderers/frame-buffer/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index afcc9921eec76ad3a5c8fedb894d5a5805a9a494..f75847ebb2b0af3b4c7478d97c607f70b9a30bee 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libply libply-splash-core . plugins client viewer tests
+SUBDIRS = libply libply-splash-core libply-splash-graphics . plugins client viewer tests
 INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)/libply                                                 \
            -I$(srcdir)/libply-splash-core                                     \
@@ -14,7 +14,7 @@ plymouthdbin_PROGRAMS = plymouthd
 plymouthd_CFLAGS = $(PLYMOUTH_CFLAGS)                                         \
                   -DPLYMOUTH_PLUGIN_PATH=\"$(PLYMOUTH_PLUGIN_PATH)\"         \
                   -DPLYMOUTH_THEME_PATH=\"$(PLYMOUTH_THEME_PATH)/\"
-plymouthd_LDADD = $(PLYMOUTH_LIBS) libply/libply.la libply-splash-core/libply-splash-core.la
+plymouthd_LDADD = $(PLYMOUTH_LIBS) libply/libply.la libply-splash-core/libply-splash-core.la libply-splash-graphics/libply-splash-graphics.la
 plymouthd_SOURCES =                                                            \
                    ply-boot-protocol.h                                        \
                    ply-boot-server.h                                          \
@@ -26,12 +26,12 @@ plymouthdspooldir = $(localstatedir)/spool/plymouth
 plymouthdtimedir = $(localstatedir)/lib/plymouth
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ply-splash-core.pc
+pkgconfig_DATA = ply-splash-core.pc ply-splash-graphics.pc
 
 install-data-hook:
        -mkdir -p $(DESTDIR)$(plymouthdrundir)
        -mkdir -p $(DESTDIR)$(plymouthdspooldir)
        -mkdir -p $(DESTDIR)$(plymouthdtimedir)
 
-EXTRA_DIST = ply-splash-core.pc.in
+EXTRA_DIST = ply-splash-core.pc.in ply-splash-graphics.pc.in
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/libply-splash-core/Makefile.am b/src/libply-splash-core/Makefile.am
index e10d58b88db991d18a1b10d6cc0b2d988986bca0..d6abc3572c44f75a4d31093256eb722310bf79a9 100644 (file)
--- a/src/libply-splash-core/Makefile.am
+++ b/src/libply-splash-core/Makefile.am
@@ -7,48 +7,32 @@ lib_LTLIBRARIES = libply-splash-core.la
 
 libply_splash_coredir = $(includedir)/plymouth-1/ply-splash-core
 libply_splash_core_HEADERS = \
-                   ply-animation.h                                           \
                    ply-boot-splash.h                                         \
                    ply-boot-splash-plugin.h                                  \
                    ply-console.h                                             \
-                   ply-entry.h                                               \
-                   ply-image.h                                               \
                    ply-keyboard.h                                            \
-                   ply-label.h                                               \
-                   ply-label-plugin.h                                        \
                    ply-pixel-buffer.h                                        \
                    ply-pixel-display.h                                       \
-                   ply-progress-animation.h                                  \
-                   ply-progress-bar.h                                        \
                    ply-renderer.h                                            \
                    ply-renderer-plugin.h                                     \
                    ply-terminal.h                                            \
                    ply-text-display.h                                        \
-                   ply-text-progress-bar.h                                   \
-                   ply-throbber.h
+                   ply-text-progress-bar.h
 
 libply_splash_core_la_CFLAGS = $(PLYMOUTH_CFLAGS)                               \
-                            $(IMAGE_CFLAGS)                                  \
                              -DPLYMOUTH_BACKGROUND_COLOR=$(background_color)   \
                        -DPLYMOUTH_BACKGROUND_END_COLOR=$(background_end_color) \
                        -DPLYMOUTH_BACKGROUND_START_COLOR=$(background_start_color) \
                        -DPLYMOUTH_PLUGIN_PATH=\"$(PLYMOUTH_PLUGIN_PATH)\"
-libply_splash_core_la_LIBADD = $(PLYMOUTH_LIBS) $(IMAGE_LIBS) ../libply/libply.la
+libply_splash_core_la_LIBADD = $(PLYMOUTH_LIBS) ../libply/libply.la
 libply_splash_core_la_LDFLAGS = -export-symbols-regex '^[^_].*' \
                    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
                    -no-undefined
 libply_splash_core_la_SOURCES = \
                    $(libply_splash_core_HEADERS)                              \
                    ply-console.c                                            \
-                   ply-entry.c                                              \
-                   ply-image.c                                              \
                    ply-keyboard.c                                           \
-                   ply-label.c                                              \
-                   ply-progress-bar.c                                       \
-                   ply-throbber.c                                           \
-                   ply-animation.c                                          \
                    ply-pixel-display.c                                      \
-                   ply-progress-animation.c                                 \
                    ply-text-display.c                                       \
                    ply-text-progress-bar.c                                  \
                    ply-terminal.c                                           \

diff --git a/src/libply-splash-graphics/Makefile.am b/src/libply-splash-graphics/Makefile.am
new file mode 100644 (file)
index 0000000..f70d1ed
--- /dev/null
+++ b/src/libply-splash-graphics/Makefile.am
@@ -0,0 +1,40 @@
+INCLUDES = -I$(top_srcdir)                                                    \
+           -I$(srcdir)                                                        \
+           -I$(srcdir)/../libply                                              \
+           -I$(srcdir)/../libply-splash-core                                  \
+           -I$(srcdir)/../plugins/controls
+
+lib_LTLIBRARIES = libply-splash-graphics.la
+
+libply_splash_graphicsdir = $(includedir)/plymouth-1/ply-splash-graphics
+libply_splash_graphics_HEADERS = \
+                                 ply-animation.h                              \
+                                 ply-entry.h                                  \
+                                 ply-image.h                                  \
+                                 ply-label.h                                  \
+                                 ply-label-plugin.h                           \
+                                 ply-progress-animation.h                     \
+                                 ply-progress-bar.h                           \
+                                 ply-throbber.h
+
+libply_splash_graphics_la_CFLAGS = $(PLYMOUTH_CFLAGS)                               \
+                                   $(IMAGE_CFLAGS)                                  \
+                                   -DPLYMOUTH_BACKGROUND_COLOR=$(background_color)  \
+                                   -DPLYMOUTH_BACKGROUND_END_COLOR=$(background_end_color) \
+                                   -DPLYMOUTH_BACKGROUND_START_COLOR=$(background_start_color) \
+                                   -DPLYMOUTH_PLUGIN_PATH=\"$(PLYMOUTH_PLUGIN_PATH)\"
+libply_splash_graphics_la_LIBADD = $(PLYMOUTH_LIBS) $(IMAGE_LIBS) ../libply/libply.la ../libply-splash-core/libply-splash-core.la
+libply_splash_graphics_la_LDFLAGS = -export-symbols-regex '^[^_].*' \
+                                    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+                                    -no-undefined
+libply_splash_graphics_la_SOURCES = \
+                                    $(libply_splash_graphics_HEADERS)         \
+                                    ply-animation.c                           \
+                                    ply-entry.c                               \
+                                    ply-image.c                               \
+                                    ply-label.c                               \
+                                    ply-progress-animation.c                  \
+                                    ply-progress-bar.c                        \
+                                    ply-throbber.c
+
+MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/libply-splash-core/ply-animation.c b/src/libply-splash-graphics/ply-animation.c
similarity index 100%
rename from src/libply-splash-core/ply-animation.c
rename to src/libply-splash-graphics/ply-animation.c

diff --git a/src/libply-splash-core/ply-animation.h b/src/libply-splash-graphics/ply-animation.h
similarity index 100%
rename from src/libply-splash-core/ply-animation.h
rename to src/libply-splash-graphics/ply-animation.h

diff --git a/src/libply-splash-core/ply-entry.c b/src/libply-splash-graphics/ply-entry.c
similarity index 100%
rename from src/libply-splash-core/ply-entry.c
rename to src/libply-splash-graphics/ply-entry.c

diff --git a/src/libply-splash-core/ply-entry.h b/src/libply-splash-graphics/ply-entry.h
similarity index 100%
rename from src/libply-splash-core/ply-entry.h
rename to src/libply-splash-graphics/ply-entry.h

diff --git a/src/libply-splash-core/ply-image.c b/src/libply-splash-graphics/ply-image.c
similarity index 100%
rename from src/libply-splash-core/ply-image.c
rename to src/libply-splash-graphics/ply-image.c

diff --git a/src/libply-splash-core/ply-image.h b/src/libply-splash-graphics/ply-image.h
similarity index 100%
rename from src/libply-splash-core/ply-image.h
rename to src/libply-splash-graphics/ply-image.h

diff --git a/src/libply-splash-core/ply-label-plugin.h b/src/libply-splash-graphics/ply-label-plugin.h
similarity index 100%
rename from src/libply-splash-core/ply-label-plugin.h
rename to src/libply-splash-graphics/ply-label-plugin.h

diff --git a/src/libply-splash-core/ply-label.c b/src/libply-splash-graphics/ply-label.c
similarity index 100%
rename from src/libply-splash-core/ply-label.c
rename to src/libply-splash-graphics/ply-label.c

diff --git a/src/libply-splash-core/ply-label.h b/src/libply-splash-graphics/ply-label.h
similarity index 100%
rename from src/libply-splash-core/ply-label.h
rename to src/libply-splash-graphics/ply-label.h

diff --git a/src/libply-splash-core/ply-progress-animation.c b/src/libply-splash-graphics/ply-progress-animation.c
similarity index 100%
rename from src/libply-splash-core/ply-progress-animation.c
rename to src/libply-splash-graphics/ply-progress-animation.c

diff --git a/src/libply-splash-core/ply-progress-animation.h b/src/libply-splash-graphics/ply-progress-animation.h
similarity index 100%
rename from src/libply-splash-core/ply-progress-animation.h
rename to src/libply-splash-graphics/ply-progress-animation.h

diff --git a/src/libply-splash-core/ply-progress-bar.c b/src/libply-splash-graphics/ply-progress-bar.c
similarity index 100%
rename from src/libply-splash-core/ply-progress-bar.c
rename to src/libply-splash-graphics/ply-progress-bar.c

diff --git a/src/libply-splash-core/ply-progress-bar.h b/src/libply-splash-graphics/ply-progress-bar.h
similarity index 100%
rename from src/libply-splash-core/ply-progress-bar.h
rename to src/libply-splash-graphics/ply-progress-bar.h

diff --git a/src/libply-splash-core/ply-throbber.c b/src/libply-splash-graphics/ply-throbber.c
similarity index 100%
rename from src/libply-splash-core/ply-throbber.c
rename to src/libply-splash-graphics/ply-throbber.c

diff --git a/src/libply-splash-core/ply-throbber.h b/src/libply-splash-graphics/ply-throbber.h
similarity index 100%
rename from src/libply-splash-core/ply-throbber.h
rename to src/libply-splash-graphics/ply-throbber.h

diff --git a/src/plugins/controls/label/Makefile.am b/src/plugins/controls/label/Makefile.am
index ab9c6471cbd9ed9f47210960f98601605d9d4f4a..296203b9d66771f3fbca8968555d49241ee715cd 100644 (file)
--- a/src/plugins/controls/label/Makefile.am
+++ b/src/plugins/controls/label/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
+           -I$(srcdir)/../../../libply-splash-graphics                        \
            -I$(srcdir)/../../..                                               \
            -I$(srcdir)/../..                                                  \
            -I$(srcdir)/..                                                     \
@@ -14,7 +15,8 @@ label_la_CFLAGS = $(PLYMOUTH_CFLAGS) $(PANGO_CFLAGS)
 label_la_LDFLAGS = -module -avoid-version -export-dynamic
 label_la_LIBADD = $(PLYMOUTH_LIBS) $(PANGO_LIBS)                           \
                   ../../../libply/libply.la                                \
-                  ../../../libply-splash-core/libply-splash-core.la
+                  ../../../libply-splash-core/libply-splash-core.la        \
+                  ../../../libply-splash-graphics/libply-splash-graphics.la
 label_la_SOURCES = $(srcdir)/plugin.c
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/plugins/splash/fade-throbber/Makefile.am b/src/plugins/splash/fade-throbber/Makefile.am
index 55915f83d2e8eb543591058e0c929a8bcd94f91a..f7b559b6f52043c5103e52427137d956930a17ea 100644 (file)
--- a/src/plugins/splash/fade-throbber/Makefile.am
+++ b/src/plugins/splash/fade-throbber/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
+           -I$(srcdir)/../../../libply-splash-graphics                        \
            -I$(srcdir)/../../..                                               \
            -I$(srcdir)/../..                                                  \
            -I$(srcdir)/..                                                     \
@@ -18,7 +19,8 @@ fade_throbber_la_CFLAGS = $(PLYMOUTH_CFLAGS)
 fade_throbber_la_LDFLAGS = -module -avoid-version -export-dynamic
 fade_throbber_la_LIBADD = $(PLYMOUTH_LIBS)                                          \
                     ../../../libply/libply.la                                 \
-                    ../../../libply-splash-core/libply-splash-core.la
+                    ../../../libply-splash-core/libply-splash-core.la         \
+                    ../../../libply-splash-graphics/libply-splash-graphics.la
 fade_throbber_la_SOURCES = $(srcdir)/plugin.c
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/plugins/splash/script/Makefile.am b/src/plugins/splash/script/Makefile.am
index 5025d0fecc607fc73f78d8cade23c6f8b9da9c38..0f2b0f76701377a5305f9770e0b292f9f97fae02 100644 (file)
--- a/src/plugins/splash/script/Makefile.am
+++ b/src/plugins/splash/script/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)/../../../libply                                        \
-           -I$(srcdir)/../../../libply-splash-core                              \
+           -I$(srcdir)/../../../libply-splash-core                            \
+           -I$(srcdir)/../../../libply-splash-graphics                        \
            -I$(srcdir)/../../..                                               \
            -I$(srcdir)/../..                                                  \
            -I$(srcdir)/..                                                     \
@@ -18,7 +19,8 @@ script_la_CFLAGS =  $(PLYMOUTH_CFLAGS)                                        \
 script_la_LDFLAGS = -module -avoid-version -export-dynamic
 script_la_LIBADD =  $(PLYMOUTH_LIBS)                                          \
                     ../../../libply/libply.la                                 \
-                    ../../../libply-splash-core/libply-splash-core.la
+                    ../../../libply-splash-core/libply-splash-core.la         \
+                    ../../../libply-splash-graphics/libply-splash-graphics.la
 script_la_SOURCES = $(srcdir)/plugin.c                                        \
                     $(srcdir)/plugin.h                                        \
                     $(srcdir)/script.c                                        \

diff --git a/src/plugins/splash/space-flares/Makefile.am b/src/plugins/splash/space-flares/Makefile.am
index df64b4859d3c1e23921d8f9d3d3e43a3146ff00d..0d22a2e7bcf7ef103fd9e113dc021c81e0041a39 100644 (file)
--- a/src/plugins/splash/space-flares/Makefile.am
+++ b/src/plugins/splash/space-flares/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
+           -I$(srcdir)/../../../libply-splash-graphics                        \
            -I$(srcdir)/../../..                                               \
            -I$(srcdir)/../..                                                  \
            -I$(srcdir)/..                                                     \
@@ -18,7 +19,8 @@ space_flares_la_CFLAGS =    $(PLYMOUTH_CFLAGS)
 space_flares_la_LDFLAGS =   -module -avoid-version -export-dynamic
 space_flares_la_LIBADD =    $(PLYMOUTH_LIBS)                                         \
                     ../../../libply/libply.la                                 \
-                    ../../../libply-splash-core/libply-splash-core.la
+                    ../../../libply-splash-core/libply-splash-core.la         \
+                    ../../../libply-splash-graphics/libply-splash-graphics.la
 space_flares_la_SOURCES = $(srcdir)/plugin.c
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/plugins/splash/throbgress/Makefile.am b/src/plugins/splash/throbgress/Makefile.am
index 61cd6de461706f9ddf9817110cacbc9beb83fa89..8f93fd29949bcd116691a0b832444dd9bbd696c4 100644 (file)
--- a/src/plugins/splash/throbgress/Makefile.am
+++ b/src/plugins/splash/throbgress/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
+           -I$(srcdir)/../../../libply-splash-graphics                        \
            -I$(srcdir)/../../..                                               \
            -I$(srcdir)/../..                                                  \
            -I$(srcdir)/..                                                     \
@@ -20,7 +21,8 @@ throbgress_la_CFLAGS = $(PLYMOUTH_CFLAGS)                                    \
 throbgress_la_LDFLAGS = -module -avoid-version -export-dynamic
 throbgress_la_LIBADD = $(PLYMOUTH_LIBS)                                      \
                        ../../../libply/libply.la                             \
-                       ../../../libply-splash-core/libply-splash-core.la
+                       ../../../libply-splash-core/libply-splash-core.la     \
+                       ../../../libply-splash-graphics/libply-splash-graphics.la
 throbgress_la_SOURCES = $(srcdir)/plugin.c
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/plugins/splash/two-step/Makefile.am b/src/plugins/splash/two-step/Makefile.am
index de13a0ab119ce2bef6edcc5a7993e9a829c3abc4..7310d6c9a8dede29edc6d755c112c70f5a3d81b2 100644 (file)
--- a/src/plugins/splash/two-step/Makefile.am
+++ b/src/plugins/splash/two-step/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)/../../../libply                                        \
            -I$(srcdir)/../../../libply-splash-core                            \
+           -I$(srcdir)/../../../libply-splash-graphics                        \
            -I$(srcdir)/../../..                                               \
            -I$(srcdir)/../..                                                  \
            -I$(srcdir)/..                                                     \
@@ -18,7 +19,8 @@ two_step_la_CFLAGS =    $(PLYMOUTH_CFLAGS)                                    \
 two_step_la_LDFLAGS =   -module -avoid-version -export-dynamic
 two_step_la_LIBADD =    $(PLYMOUTH_LIBS)                                      \
                     ../../../libply/libply.la                                 \
-                    ../../../libply-splash-core/libply-splash-core.la
+                    ../../../libply-splash-core/libply-splash-core.la         \
+                    ../../../libply-splash-graphics/libply-splash-graphics.la
 two_step_la_SOURCES = $(srcdir)/plugin.c
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/ply-splash-graphics.pc.in b/src/ply-splash-graphics.pc.in
new file mode 100644 (file)
index 0000000..cb37711
--- /dev/null
+++ b/src/ply-splash-graphics.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+pluginsdir=@PLYMOUTH_PLUGIN_PATH@
+themesdir=@PLYMOUTH_THEME_PATH@/
+
+Name: Plymouth
+Description: Graphics Utility Library for Boot Splash Plugins
+Version: @VERSION@
+Requires: ply-splash-core
+Libs: -L${libdir}
+Cflags: -I${includedir}/plymouth-1/ply-splash-graphics