summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2015-02-13 10:03:05 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2015-02-13 10:03:05 +0100
commit6bcca3fb1f4ef9a925750521571ce58e0edfba7e (patch)
treedcc0aa8a40ce6aaf4e8ebb670c327f3f7fe9bbb7
parent681573c555f5c4edcb990789f8b574e5f5efae52 (diff)
downloadefl-devs/stefan/ecore-drm-logind.tar.gz
ecore/drm: Compile ecore_drm_logind.c without conditiondevs/stefan/ecore-drm-logind
Right now we excluded the file from the build if we did not find system-logind. We are using some symbols from this file without any condition though: lib/ecore_drm/.libs/libecore_drm.so: undefined reference to `_ecore_drm_logind_device_open_no_pending' lib/ecore_drm/.libs/libecore_drm.so: undefined reference to `_ecore_drm_logind_connect' lib/ecore_drm/.libs/libecore_drm.so: undefined reference to `_ecore_drm_logind_disconnect' lib/ecore_drm/.libs/libecore_drm.so: undefined reference to `_ecore_drm_logind_device_close' This comes from a Gentoo machine without systemd. As the logind relevant parts are ifdef'ed in the code itself it is safe to build this file in all cases and thus avoid the undefined references.
-rw-r--r--src/Makefile_Ecore_Drm.am5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/Makefile_Ecore_Drm.am b/src/Makefile_Ecore_Drm.am
index 61a15556b9..e331e7aeea 100644
--- a/src/Makefile_Ecore_Drm.am
+++ b/src/Makefile_Ecore_Drm.am
@@ -18,13 +18,10 @@ lib/ecore_drm/ecore_drm_tty.c \
lib/ecore_drm/ecore_drm_device.c \
lib/ecore_drm/ecore_drm_launcher.c \
lib/ecore_drm/ecore_drm_dbus.c \
+lib/ecore_drm/ecore_drm_logind.c \
lib/ecore_drm/ecore_drm.c \
lib/ecore_drm/ecore_drm_private.h
-if HAVE_SYSTEMD_LOGIN
-lib_ecore_drm_libecore_drm_la_SOURCES += \
-lib/ecore_drm/ecore_drm_logind.c
-endif
lib_ecore_drm_libecore_drm_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/efl \