chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
login: port test-inhibit to libsystemd-bus
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index e9b80bf11613928049e201e30881e0efb4d128b1..bc67063ce6167f2d636b2524a0a03082e818d35a 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-750,7
+750,9
@@
libsystemd_shared_la_SOURCES = \
src/shared/ima-util.c \
src/shared/ima-util.h \
src/shared/ptyfwd.c \
src/shared/ima-util.c \
src/shared/ima-util.h \
src/shared/ptyfwd.c \
- src/shared/ptyfwd.h
+ src/shared/ptyfwd.h \
+ src/shared/net-util.c \
+ src/shared/net-util.h
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
@@
-758,11
+760,7
@@
noinst_LTLIBRARIES += \
libsystemd_dbus_la_SOURCES = \
src/shared/dbus-common.c \
libsystemd_dbus_la_SOURCES = \
src/shared/dbus-common.c \
- src/shared/dbus-common.h \
- src/shared/dbus-loop.c \
- src/shared/dbus-loop.h \
- src/shared/polkit.c \
- src/shared/polkit.h
+ src/shared/dbus-common.h
libsystemd_dbus_la_CFLAGS = \
$(AM_CFLAGS) \
libsystemd_dbus_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-2232,6
+2230,7
@@
dist_udevrules_DATA += \
rules/99-systemd.rules \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
rules/99-systemd.rules \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
+ rules/60-drm.rules \
rules/60-keyboard.rules \
rules/60-persistent-storage-tape.rules \
rules/60-persistent-serial.rules \
rules/60-keyboard.rules \
rules/60-persistent-storage-tape.rules \
rules/60-persistent-serial.rules \
@@
-2328,7
+2327,6
@@
libudev_core_la_SOURCES = \
src/udev/udev-builtin-usb_id.c \
src/udev/net/link-config.h \
src/udev/net/link-config.c \
src/udev/udev-builtin-usb_id.c \
src/udev/net/link-config.h \
src/udev/net/link-config.c \
- src/udev/net/link-config-parse.c \
src/udev/net/ethtool-util.h \
src/udev/net/ethtool-util.c
src/udev/net/ethtool-util.h \
src/udev/net/ethtool-util.c
@@
-3809,16
+3807,15
@@
libsystemd_logind_core_la_SOURCES = \
src/login/login-shared.h
libsystemd_logind_core_la_CFLAGS = \
src/login/login-shared.h
libsystemd_logind_core_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(AM_CFLAGS)
libsystemd_logind_core_la_LIBADD = \
libsystemd-label.la \
libsystemd-audit.la \
libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd_logind_core_la_LIBADD = \
libsystemd-label.la \
libsystemd-audit.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-dbus.la \
libsystemd-id128-internal.la \
libsystemd-id128-internal.la \
+ libsystemd-bus.la \
libudev.la
if HAVE_ACL
libudev.la
if HAVE_ACL
@@
-3898,11
+3895,7
@@
test_inhibit_SOURCES = \
test_inhibit_LDADD = \
libsystemd-shared.la \
test_inhibit_LDADD = \
libsystemd-shared.la \
- libsystemd-dbus.la
-
-test_inhibit_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ libsystemd-bus.la
test_login_tables_SOURCES = \
src/login/test-login-tables.c
test_login_tables_SOURCES = \
src/login/test-login-tables.c