diff options
| author | Ray Strode <rstrode@redhat.com> | 2008-06-09 10:18:39 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2008-06-09 11:38:56 -0400 |
| commit | 5d1e93403afe32e6879515b1c74b3e5b6366ad54 (patch) | |
| tree | 0595d82997da376e5fb9d2437f8b53ec206baa72 /src/splash-plugins | |
| parent | a9b7809acf14ca00a5983fbd3c6160325a029994 (diff) | |
| download | plymouth-5d1e93403afe32e6879515b1c74b3e5b6366ad54.tar.gz plymouth-5d1e93403afe32e6879515b1c74b3e5b6366ad54.tar.xz plymouth-5d1e93403afe32e6879515b1c74b3e5b6366ad54.zip | |
Create new libplybootsplash
The old approach of including the same source files into
multiple places is less than pretty. But moving the code
to libply didn't seem right either, since libply is fairly
generic and could in theory get swapped out with a standard
runtime at some point.
Also, exposing libplybootsplash as an external library will
facilitate creating out of tree splash plugins.
Diffstat (limited to 'src/splash-plugins')
| -rw-r--r-- | src/splash-plugins/details/Makefile.am | 12 | ||||
| -rw-r--r-- | src/splash-plugins/fade-in/Makefile.am | 12 | ||||
| -rw-r--r-- | src/splash-plugins/spinfinity/Makefile.am | 16 | ||||
| -rw-r--r-- | src/splash-plugins/text/Makefile.am | 12 |
4 files changed, 22 insertions, 30 deletions
diff --git a/src/splash-plugins/details/Makefile.am b/src/splash-plugins/details/Makefile.am index b289d52..9995b7a 100644 --- a/src/splash-plugins/details/Makefile.am +++ b/src/splash-plugins/details/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = -I$(top_srcdir) \ -I$(srcdir)/../../libply \ + -I$(srcdir)/../../libplybootsplash \ -I$(srcdir)/../.. \ -I$(srcdir)/.. \ -I$(srcdir) @@ -9,12 +10,9 @@ 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 -details_la_SOURCES = $(srcdir)/../../ply-boot-splash-plugin.h \ - $(srcdir)/../../ply-answer.h \ - $(srcdir)/../../ply-answer.c \ - $(srcdir)/../../ply-window.h \ - $(srcdir)/../../ply-window.c \ - $(srcdir)/plugin.c +details_la_LIBADD = $(PLYMOUTH_LIBS) \ + ../../libply/libply.la \ + ../../libplybootsplash/libplybootsplash.la +details_la_SOURCES = $(srcdir)/plugin.c MAINTAINERCLEANFILES = Makefile.in diff --git a/src/splash-plugins/fade-in/Makefile.am b/src/splash-plugins/fade-in/Makefile.am index 4e26835..0f9441d 100644 --- a/src/splash-plugins/fade-in/Makefile.am +++ b/src/splash-plugins/fade-in/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = -I$(top_srcdir) \ -I$(srcdir)/../../libply \ + -I$(srcdir)/../../libplybootsplash \ -I$(srcdir)/../.. \ -I$(srcdir)/.. \ -I$(srcdir) @@ -12,13 +13,10 @@ fade_in_la_CFLAGS = $(PLYMOUTH_CFLAGS) \ -DPLYMOUTH_LOGO_FILE=\"$(logofile)\" \ -DPLYMOUTH_BACKGROUND_COLOR=$(background_color) 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-answer.h \ - $(srcdir)/../../ply-answer.c \ - $(srcdir)/../../ply-window.h \ - $(srcdir)/../../ply-window.c \ - $(srcdir)/plugin.c +fade_in_la_LIBADD = $(PLYMOUTH_LIBS) \ + ../../libply/libply.la \ + ../../libplybootsplash/libplybootsplash.la +fade_in_la_SOURCES = $(srcdir)/plugin.c plymouthdir = $(datadir)/plymouth/fade-in plymouth_DATA = star.png bullet.png entry.png lock.png diff --git a/src/splash-plugins/spinfinity/Makefile.am b/src/splash-plugins/spinfinity/Makefile.am index 23cdd54..8a22804 100644 --- a/src/splash-plugins/spinfinity/Makefile.am +++ b/src/splash-plugins/spinfinity/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = -I$(top_srcdir) \ -I$(srcdir)/../../libply \ + -I$(srcdir)/../../libplybootsplash \ -I$(srcdir)/../.. \ -I$(srcdir)/.. \ -I$(srcdir) @@ -13,15 +14,12 @@ spinfinity_la_CFLAGS = $(PLYMOUTH_CFLAGS) \ -DPLYMOUTH_BACKGROUND_COLOR=$(background_color) spinfinity_la_LDFLAGS = -module -avoid-version -export-dynamic -spinfinity_la_LIBADD = $(PLYMOUTH_LIBS) ../../libply/libply.la -spinfinity_la_SOURCES = $(srcdir)/../../ply-boot-splash-plugin.h \ - $(srcdir)/../../ply-answer.h \ - $(srcdir)/../../ply-answer.c \ - $(srcdir)/../../ply-window.h \ - $(srcdir)/../../ply-window.c \ - $(srcdir)/throbber.h \ - $(srcdir)/throbber.c \ - $(srcdir)/plugin.c +spinfinity_la_LIBADD = $(PLYMOUTH_LIBS) \ + ../../libply/libply.la \ + ../../libplybootsplash/libplybootsplash.la +spinfinity_la_SOURCES = $(srcdir)/plugin.c \ + $(srcdir)/throbber.h \ + $(srcdir)/throbber.c throbber_frames = \ throbber-00.png \ diff --git a/src/splash-plugins/text/Makefile.am b/src/splash-plugins/text/Makefile.am index 2d9ba73..075230a 100644 --- a/src/splash-plugins/text/Makefile.am +++ b/src/splash-plugins/text/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = -I$(top_srcdir) \ -I$(srcdir)/../../libply \ + -I$(srcdir)/../../libplybootsplash \ -I$(srcdir)/../.. \ -I$(srcdir)/.. \ -I$(srcdir) @@ -9,12 +10,9 @@ plugin_LTLIBRARIES = text.la text_la_CFLAGS = $(PLYMOUTH_CFLAGS) text_la_LDFLAGS = -module -avoid-version -export-dynamic -text_la_LIBADD = $(PLYMOUTH_LIBS) ../../libply/libply.la -text_la_SOURCES = $(srcdir)/../../ply-boot-splash-plugin.h \ - $(srcdir)/../../ply-answer.h \ - $(srcdir)/../../ply-answer.c \ - $(srcdir)/../../ply-window.h \ - $(srcdir)/../../ply-window.c \ - $(srcdir)/plugin.c +text_la_LIBADD = $(PLYMOUTH_LIBS) \ + ../../libply/libply.la \ + ../../libplybootsplash/libplybootsplash.la +text_la_SOURCES = $(srcdir)/plugin.c MAINTAINERCLEANFILES = Makefile.in |