From: Ray Strode Date: Wed, 13 Jan 2010 21:05:21 +0000 (-0500) Subject: [splash] Split out graphical parts of libply-splash-core X-Git-Tag: 0.8.0~79^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Foptionalize-library-dependencies;p=thirdparty%2Fplymouth.git [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 a859b500..6ecb6281 100644 --- 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 afcc9921..f75847eb 100644 --- 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 e10d58b8..d6abc357 100644 --- 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 index 00000000..f70d1ed6 --- /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 ab9c6471..296203b9 100644 --- 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 55915f83..f7b559b6 100644 --- 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 5025d0fe..0f2b0f76 100644 --- 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 df64b485..0d22a2e7 100644 --- 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 61cd6de4..8f93fd29 100644 --- 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 de13a0ab..7310d6c9 100644 --- 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 index 00000000..cb377113 --- /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