[PATCH] fix build, incorrect linking

Cristian Rodríguez crrodriguez at opensuse.org
Sat Dec 14 15:22:19 PST 2013


It is splashy-core that needs to be linked with udev, not plymouthd
this causes linking to fail.
---
 src/Makefile.am                    | 3 +--
 src/libply-splash-core/Makefile.am | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 3803448..152cd43 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,13 +15,12 @@ plymouthdbindir = $(plymouthdaemondir)
 plymouthdbin_PROGRAMS = plymouthd
 
 plymouthd_CFLAGS = $(PLYMOUTH_CFLAGS)                                         \
-		   $(UDEV_CFLAGS)                                             \
 		   -DPLYMOUTH_PLUGIN_PATH=\"$(PLYMOUTH_PLUGIN_PATH)\"         \
 		   -DPLYMOUTH_THEME_PATH=\"$(PLYMOUTH_THEME_PATH)/\"          \
 		   -DPLYMOUTH_POLICY_DIR=\"$(PLYMOUTH_POLICY_DIR)/\"          \
 		   -DPLYMOUTH_RUNTIME_DIR=\"$(PLYMOUTH_RUNTIME_DIR)\"         \
 		   -DPLYMOUTH_CONF_DIR=\"$(PLYMOUTH_CONF_DIR)/\"
-plymouthd_LDADD = $(PLYMOUTH_LIBS) $(UDEV_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
 plymouthd_SOURCES =                                                            \
                    ply-boot-protocol.h                                        \
                    ply-boot-server.h                                          \
diff --git a/src/libply-splash-core/Makefile.am b/src/libply-splash-core/Makefile.am
index 960ffdc..d07d7f1 100644
--- a/src/libply-splash-core/Makefile.am
+++ b/src/libply-splash-core/Makefile.am
@@ -27,12 +27,12 @@ libply_splash_core_HEADERS = \
 		    ply-text-progress-bar.h                                   \
 		    ply-text-step-bar.h
 
-libply_splash_core_la_CFLAGS = $(PLYMOUTH_CFLAGS)                               \
+libply_splash_core_la_CFLAGS = $(PLYMOUTH_CFLAGS) $(UDEV_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) ../libply/libply.la
+libply_splash_core_la_LIBADD = $(PLYMOUTH_LIBS) $(UDEV_LIBS) ../libply/libply.la
 libply_splash_core_la_LDFLAGS = -export-symbols-regex '^[^_].*' \
 		    -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 		    -no-undefined
-- 
1.8.4



More information about the plymouth mailing list