chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v231.2: login/elogind.c: Remove bus_forward_agent_released()
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index c03e6fd4713d6c6be735651c9a5181404b52d13a..20ed1324dbc45b7ac0f042137cd1e974dddad16b 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-39,7
+39,7
@@
SUBDIRS = . po
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
LIBELOGIND_CURRENT=16
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
LIBELOGIND_CURRENT=16
-LIBELOGIND_REVISION=
0
+LIBELOGIND_REVISION=
2
LIBELOGIND_AGE=16
# Dirs of external packages
LIBELOGIND_AGE=16
# Dirs of external packages
@@
-156,6
+156,7
@@
AM_CPPFLAGS = \
-I $(top_srcdir)/src/libelogind/sd-login \
-I $(top_srcdir)/src/libelogind/sd-id128 \
-I $(top_srcdir)/src/update-utmp \
-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)
$(OUR_CPPFLAGS)
AM_CFLAGS = $(OUR_CFLAGS)
@@
-453,15
+454,11
@@
libshared_la_SOURCES = \
src/shared/musl_missing.c \
src/shared/pager.c \
src/shared/pager.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/spawn-polkit-agent.c \
src/shared/spawn-polkit-agent.h
-if HAVE_UTMP
-libshared_la_SOURCES += \
- src/shared/utmp-wtmp.c \
- src/update-utmp/update-utmp.c
-endif
-
if HAVE_ACL
libshared_la_SOURCES += \
src/shared/acl-util.c \
if HAVE_ACL
libshared_la_SOURCES += \
src/shared/acl-util.c \
@@
-484,9
+481,7
@@
rootlibexec_LTLIBRARIES += \
libelogind_shared_la_SOURCES = \
$(libbasic_la_SOURCES) \
$(libshared_la_SOURCES) \
libelogind_shared_la_SOURCES = \
$(libbasic_la_SOURCES) \
$(libshared_la_SOURCES) \
- $(libelogind_internal_la_SOURCES) \
- $(libelogind_journal_internal_la_SOURCES) \
- $(libudev_internal_la_SOURCES)
+ $(libelogind_internal_la_SOURCES)
libelogind_shared_la_CFLAGS = \
$(AM_CFLAGS) \
libelogind_shared_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-697,6
+692,14
@@
elogind_LDADD = \
libelogind-core.la
libelogind_core_la_SOURCES = \
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/logind-core.c \
src/login/logind-device.c \
src/login/logind-device.h \
src/login/logind-core.c \
src/login/logind-device.c \
src/login/logind-device.h \
@@
-710,8
+713,6
@@
libelogind_core_la_SOURCES = \
src/login/logind-session.h \
src/login/logind-session-device.c \
src/login/logind-session-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-user.c \
src/login/logind-user.h \
src/login/logind-inhibit.c \
@@
-722,10
+723,14
@@
libelogind_core_la_SOURCES = \
src/login/logind-user-dbus.c \
src/login/logind-utmp.c \
src/login/logind-acl.h \
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 = \
libelogind-shared.la
libelogind_core_la_LIBADD = \
libelogind-shared.la
@@
-742,6
+747,8
@@
pkglibexec_PROGRAMS += \
elogind
loginctl_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
src/login/loginctl.c \
src/login/sysfs-show.h \
src/login/sysfs-show.c
@@
-818,7
+825,7
@@
pam_elogind_la_LDFLAGS = \
-Wl,--version-script=$(top_srcdir)/src/login/pam_elogind.sym
pam_elogind_la_LIBADD = \
-Wl,--version-script=$(top_srcdir)/src/login/pam_elogind.sym
pam_elogind_la_LIBADD = \
- lib
elogind-
shared.la \
+ libshared.la \
$(PAM_LIBS)
pamlib_LTLIBRARIES = \
$(PAM_LIBS)
pamlib_LTLIBRARIES = \