X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=825057207c98b06ea151dfa55f1d9f1529e24c91;hp=c03e6fd4713d6c6be735651c9a5181404b52d13a;hb=d72545b2a0c29e5844c508101cd4720c356193b4;hpb=5d2803744e2a425ad476737fb3f812833a632f7d

diff --git a/Makefile.am b/Makefile.am
index c03e6fd47..825057207 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBELOGIND_CURRENT=16
-LIBELOGIND_REVISION=0
+LIBELOGIND_REVISION=4
 LIBELOGIND_AGE=16
 
 # Dirs of external packages
@@ -83,7 +83,6 @@ CLEAN_LOCAL_HOOKS =
 pkginclude_HEADERS =
 noinst_LTLIBRARIES =
 lib_LTLIBRARIES =
-rootlibexec_LTLIBRARIES =
 noinst_DATA =
 pkgconfiglib_DATA =
 polkitpolicy_in_files =
@@ -156,6 +155,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 +453,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 \
@@ -478,15 +474,13 @@ libshared_la_LIBADD = \
 	$(UDEV_LIBS) \
 	$(ACL_LIBS)
 
-rootlibexec_LTLIBRARIES += \
+noinst_LTLIBRARIES += \
 	libelogind-shared.la
 
 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) \
@@ -628,9 +622,6 @@ libelogind_internal_la_SOURCES = \
 	src/libelogind/sd-daemon/sd-daemon.c \
 	src/libelogind/sd-login/sd-login.c
 
-libelogind_internal_la_LIBADD = \
-	-lresolv
-
 noinst_LTLIBRARIES += \
 	libelogind-internal.la
 
@@ -697,6 +688,16 @@ 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/elogind-dbus.c \
+	src/login/elogind-dbus.h \
 	src/login/logind-core.c \
 	src/login/logind-device.c \
 	src/login/logind-device.h \
@@ -710,8 +711,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 +721,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 +745,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
@@ -818,7 +823,7 @@ pam_elogind_la_LDFLAGS = \
 	-Wl,--version-script=$(top_srcdir)/src/login/pam_elogind.sym
 
 pam_elogind_la_LIBADD = \
-	libelogind-shared.la \
+	libshared.la \
 	$(PAM_LIBS)
 
 pamlib_LTLIBRARIES = \