# Keep the test-suite.log
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
-LIBELOGIND_CURRENT=15
-LIBELOGIND_REVISION=0
-LIBELOGIND_AGE=15
+LIBELOGIND_CURRENT=16
+LIBELOGIND_REVISION=4
+LIBELOGIND_AGE=16
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/elogind
-pkgincludedir=$(includedir)/elogind
+pkgincludedir=$(includedir)/elogind/systemd
udevrulesdir=@udevrulesdir@
udevbindir=@udevbindir@
udevlibexecdir=$(udevbindir)
dist_dbussystemservice_DATA =
check_PROGRAMS =
check_DATA =
+dist_rootlibexec_DATA =
tests=
manual_tests =
if ENABLE_TESTS
-I $(top_srcdir)/src/libelogind/sd-bus \
-I $(top_srcdir)/src/libelogind/sd-event \
-I $(top_srcdir)/src/libelogind/sd-login \
+ -I $(top_srcdir)/src/libelogind/sd-id128 \
+ -I $(top_srcdir)/src/update-utmp \
+ -I $(top_srcdir)/src/sleep \
$(OUR_CPPFLAGS)
AM_CFLAGS = $(OUR_CFLAGS)
libbasic_la_SOURCES = \
src/basic/missing.h \
- src/basic/musl_missing.h \
- src/basic/musl_missing.c \
src/basic/capability-util.c \
src/basic/capability-util.h \
src/basic/conf-files.c \
src/basic/escape.h \
src/basic/path-util.c \
src/basic/path-util.h \
+ src/basic/parse-printf-format.c \
+ src/basic/parse-printf-format.h \
src/basic/time-util.c \
src/basic/time-util.h \
src/basic/locale-util.c \
src/basic/copy.c \
src/basic/copy.h \
src/basic/alloc-util.h \
- src/basic/alloc-util.c \
- src/basic/parse-printf-format.c \
- src/basic/parse-printf-format.h
+ src/basic/alloc-util.c
nodist_libbasic_la_SOURCES = \
src/basic/errno-from-name.h \
libshared.la
libshared_la_SOURCES = \
+ src/shared/bus-util.c \
+ src/shared/bus-util.h \
+ src/shared/clean-ipc.c \
+ src/shared/clean-ipc.h \
src/shared/conf-parser.c \
src/shared/conf-parser.h \
+ src/shared/musl_missing.h \
+ src/shared/musl_missing.c \
src/shared/pager.c \
src/shared/pager.h \
+ src/shared/sleep-config.c \
+ src/shared/sleep-config.h \
src/shared/spawn-polkit-agent.c \
- src/shared/spawn-polkit-agent.h \
- src/shared/clean-ipc.c \
- src/shared/clean-ipc.h \
- src/shared/bus-util.c \
- src/shared/bus-util.h
+ src/shared/spawn-polkit-agent.h
if HAVE_ACL
libshared_la_SOURCES += \
libshared_la_LIBADD = \
libelogind-internal.la \
+ libbasic.la \
$(UDEV_LIBS) \
$(ACL_LIBS)
+noinst_LTLIBRARIES += \
+ libelogind-shared.la
+
+libelogind_shared_la_SOURCES = \
+ $(libbasic_la_SOURCES) \
+ $(libshared_la_SOURCES) \
+ $(libelogind_internal_la_SOURCES)
+
+libelogind_shared_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(libbasic_la_CFLAGS) \
+ $(libshared_la_CFLAGS) \
+ $(libelogind_internal_la_CFLAGS) \
+ $(libelogind_journal_internal_la_CFLAGS) \
+ $(libudev_internal_la_CFLAGS) \
+ $(ACL_CFLAGS) \
+ $(LIBIDN_CFLAGS) \
+ $(SECCOMP_CFLAGS) \
+ -fvisibility=default
+
+# We can't use libshared_la_LIBADD here because it would
+# pull in libelogind*-internal.la
+libelogind_shared_la_LIBADD = \
+ $(libbasic_la_LIBADD) \
+ $(libelogind_internal_la_LIBADD) \
+ $(UDEV_LIBS) \
+ $(ACL_LIBS) \
+ $(LIBIDN_LIBS) \
+ $(SECCOMP_LIBS)
+
+libelogind_shared_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ -release $(PACKAGE_VERSION)
+
+ # -----------------------------------------------------------------------------
gperf_txt_sources = \
src/basic/errno-list.txt
src/cgroups-agent/cgroups-agent.c
elogind_cgroups_agent_LDADD = \
- libshared.la
+ libelogind-shared.la
# ------------------------------------------------------------------------------
libelogind_internal_la_SOURCES = \
src/libelogind/sd-bus/bus-protocol.h \
src/libelogind/sd-event/sd-event.c \
src/libelogind/sd-id128/sd-id128.c \
+ src/libelogind/sd-id128/id128-util.h \
+ src/libelogind/sd-id128/id128-util.c \
src/libelogind/sd-daemon/sd-daemon.c \
src/libelogind/sd-login/sd-login.c
-libelogind_internal_la_LIBADD = \
- libbasic.la \
- -lresolv
-
noinst_LTLIBRARIES += \
libelogind-internal.la
src/libelogind/sd-bus/DIFFERENCES \
src/libelogind/sd-bus/GVARIANT-SERIALIZATION
-libelogind_la_SOURCES = \
- $(libelogind_internal_la_SOURCES)
-
-nodist_libelogind_la_SOURCES = \
- $(nodist_libelogind_internal_la_SOURCES)
-
-libelogind_la_CFLAGS = \
- $(libelogind_internal_la_CFLAGS)
+libelogind_la_SOURCES =
libelogind_la_LDFLAGS = \
$(AM_LDFLAGS) \
-Wl,--version-script=$(top_srcdir)/src/libelogind/libelogind.sym
libelogind_la_LIBADD = \
- $(libelogind_internal_la_LIBADD)
+ libelogind-internal.la \
+ libbasic.la
libelogind-install-hook:
libname=libelogind.so && $(move-to-rootlibdir)
src/systemd/sd-id128.h \
src/systemd/_sd-common.h
+header-install-hook:
+ $(MKDIR_P) $(DESTDIR)/$(pkgincludedir)
+ cd $(DESTDIR)/$(includedir)/elogind && \
+ for hdr in $(notdir $(pkginclude_HEADERS)) ; do \
+ rm -f $$hdr ; \
+ $(LN_S) systemd/$$hdr $$hdr ; \
+ done
+
+header-uninstall-hook:
+ m -f $(DESTDIR)/$(includedir)/elogind/*.h
+
+INSTALL_EXEC_HOOKS += header-install-hook
+UNINSTALL_EXEC_HOOKS += header-uninstall-hook
lib_LTLIBRARIES += \
libelogind.la
libelogind-core.la
libelogind_core_la_SOURCES = \
+ src/core/cgroup.h \
+ src/core/cgroup.c \
+ src/core/mount-setup.h \
+ src/core/mount-setup.c \
+ src/login/elogind.c \
+ src/login/elogind.h \
+ src/login/elogind-action.c \
+ src/login/elogind-action.h \
+ src/login/elogind-dbus.c \
+ src/login/elogind-dbus.h \
src/login/logind-core.c \
src/login/logind-device.c \
src/login/logind-device.h \
src/login/logind-session.h \
src/login/logind-session-device.c \
src/login/logind-session-device.h \
- src/login/logind-sleep.c \
- src/login/logind-sleep.h \
src/login/logind-user.c \
src/login/logind-user.h \
src/login/logind-inhibit.c \
src/login/logind-session-dbus.c \
src/login/logind-seat-dbus.c \
src/login/logind-user-dbus.c \
+ src/login/logind-utmp.c \
src/login/logind-acl.h \
- src/core/cgroup.h \
- src/core/cgroup.c \
- src/core/mount-setup.h \
- src/core/mount-setup.c
+ src/sleep/sleep.c \
+ src/sleep/sleep.h
+
+if HAVE_UTMP
+libelogind_core_la_SOURCES += \
+ src/shared/utmp-wtmp.c \
+ src/update-utmp/update-utmp.c
+endif
libelogind_core_la_LIBADD = \
- libshared.la
+ libelogind-shared.la
if HAVE_ACL
libelogind_core_la_SOURCES += \
elogind
loginctl_SOURCES = \
+ src/login/eloginctl.c \
+ src/login/eloginctl.h \
src/login/loginctl.c \
src/login/sysfs-show.h \
src/login/sysfs-show.c
loginctl_LDADD = \
- libshared.la
+ libelogind-shared.la
rootbin_PROGRAMS += \
loginctl
src/login/inhibit.c
elogind_inhibit_LDADD = \
- libshared.la
+ libelogind-shared.la
rootbin_PROGRAMS += \
elogind-inhibit
src/libelogind/sd-login/test-login.c
test_login_LDADD = \
- libshared.la
+ libelogind-shared.la
test_login_shared_SOURCES = \
src/login/test-login-shared.c
test_login_shared_LDADD = \
- libshared.la
+ libelogind-shared.la
test_inhibit_SOURCES = \
src/login/test-inhibit.c
test_inhibit_LDADD = \
- libshared.la
+ libelogind-shared.la
test_login_tables_SOURCES = \
src/login/test-login-tables.c
.PHONY: valgrind-tests
valgrind-tests: $(TESTS)
$(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
- if file $$f | grep -q shell; then \
+ if $(LIBTOOL) --mode=execute file $$f | grep -q shell; then \
echo -e "$${x}Skipping non-binary $$f"; else \
echo -e "$${x}Running $$f"; \
libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
~ianmdlvl / elogind.git / blobdiff