diff options
| -rw-r--r-- | Makefile.am | 33 | ||||
| -rw-r--r-- | cb/elogind.cbp | 27 |
2 files changed, 43 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index c03e6fd47..bd4230c0d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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/sleep \ $(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/sleep-config.c \ + src/shared/sleep-config.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 \ @@ -697,6 +694,14 @@ elogind_LDADD = \ 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 \ @@ -710,8 +715,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-sleep.c \ - src/login/logind-sleep.h \ src/login/logind-user.c \ src/login/logind-user.h \ src/login/logind-inhibit.c \ @@ -722,10 +725,14 @@ libelogind_core_la_SOURCES = \ 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 @@ -742,6 +749,8 @@ pkglibexec_PROGRAMS += \ 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 diff --git a/cb/elogind.cbp b/cb/elogind.cbp index 9dea79f54..b090b7da2 100644 --- a/cb/elogind.cbp +++ b/cb/elogind.cbp @@ -383,6 +383,18 @@ <Unit filename="../src/libelogind/sd-login/test-login.c"> <Option compilerVar="CC" /> </Unit> + <Unit filename="../src/login/eloginctl.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="../src/login/eloginctl.h" /> + <Unit filename="../src/login/elogind-action.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="../src/login/elogind-action.h" /> + <Unit filename="../src/login/elogind.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="../src/login/elogind.h" /> <Unit filename="../src/login/inhibit.c"> <Option compilerVar="CC" /> </Unit> @@ -414,6 +426,7 @@ <Unit filename="../src/login/logind-gperf.c"> <Option compilerVar="CC" /> </Unit> + <Unit filename="../src/login/logind-gperf.gperf" /> <Unit filename="../src/login/logind-inhibit.c"> <Option compilerVar="CC" /> </Unit> @@ -436,10 +449,6 @@ <Option compilerVar="CC" /> </Unit> <Unit filename="../src/login/logind-session.h" /> - <Unit filename="../src/login/logind-sleep.c"> - <Option compilerVar="CC" /> - </Unit> - <Unit filename="../src/login/logind-sleep.h" /> <Unit filename="../src/login/logind-user-dbus.c"> <Option compilerVar="CC" /> </Unit> @@ -453,7 +462,7 @@ <Unit filename="../src/login/logind.c"> <Option compilerVar="CC" /> </Unit> - <Unit filename="../src/login/logind.conf" /> + <Unit filename="../src/login/logind.conf.in" /> <Unit filename="../src/login/logind.h" /> <Unit filename="../src/login/pam_elogind.c"> <Option compilerVar="CC" /> @@ -495,6 +504,10 @@ <Option compilerVar="CC" /> </Unit> <Unit filename="../src/shared/pager.h" /> + <Unit filename="../src/shared/sleep-config.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="../src/shared/sleep-config.h" /> <Unit filename="../src/shared/spawn-polkit-agent.c"> <Option compilerVar="CC" /> </Unit> @@ -505,6 +518,10 @@ <Option compilerVar="CC" /> </Unit> <Unit filename="../src/shared/utmp-wtmp.h" /> + <Unit filename="../src/sleep/sleep.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="../src/sleep/sleep.h" /> <Unit filename="../src/systemd/_sd-common.h" /> <Unit filename="../src/systemd/sd-bus-protocol.h" /> <Unit filename="../src/systemd/sd-bus-vtable.h" /> |