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

diff --git a/Makefile.am b/Makefile.am
index bd4230c0d..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 =
@@ -475,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) \
@@ -625,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
 
@@ -702,6 +696,8 @@ libelogind_core_la_SOURCES = \
         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 \
@@ -827,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 = \