From f3d73e155b394bca10d10061e6f411fbad01425d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sat, 14 Dec 2013 23:22:19 +0000 Subject: [PATCH] build-goo: link libudev with libply-splash-core instead of plymouthd The libply-splash-core library provides functions for controlling the input and output of the splash screen. Recently it gained support for device enumeration from udev using the libudev library. When that support was added, the linker and compiler flags of the plymouthd binary were augmented, instead of the the libply-splash-core library directly. That broke the build on some systems. This commit moves the linker and compiler flags to the correct place. --- 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 38034484..152cd437 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 960ffdc0..d07d7f18 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