chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: remove CFLAGS default assignment
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 630fb19c3545289ea8b2065ce2cc91560a610085..ed618847e85156d109b264f5822dfc887f2a2fe6 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-344,6
+344,7
@@
dist_zshcompletion_DATA = \
shell-completion/zsh/_kernel-install \
shell-completion/zsh/_systemd-nspawn \
shell-completion/zsh/_systemd-analyze \
shell-completion/zsh/_kernel-install \
shell-completion/zsh/_systemd-nspawn \
shell-completion/zsh/_systemd-analyze \
+ shell-completion/zsh/_systemd-run \
shell-completion/zsh/_sd_hosts_or_user_at_host \
shell-completion/zsh/_systemd-delta \
shell-completion/zsh/_systemd
shell-completion/zsh/_sd_hosts_or_user_at_host \
shell-completion/zsh/_systemd-delta \
shell-completion/zsh/_systemd
@@
-749,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 += \
@@
-757,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) \
@@
-2231,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 \
@@
-2327,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
@@
-3521,13
+3520,9
@@
SYSTEM_UNIT_ALIASES += \
hostnamectl_SOURCES = \
src/hostname/hostnamectl.c
hostnamectl_SOURCES = \
src/hostname/hostnamectl.c
-hostnamectl_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
hostnamectl_LDADD = \
libsystemd-shared.la \
hostnamectl_LDADD = \
libsystemd-shared.la \
- libsystemd-
d
bus.la \
+ libsystemd-bus.la \
libsystemd-id128-internal.la
bin_PROGRAMS += \
libsystemd-id128-internal.la
bin_PROGRAMS += \
@@
-3775,9
+3770,6
@@
systemd_logind_SOURCES = \
nodist_systemd_logind_SOURCES = \
src/login/logind-gperf.c
nodist_systemd_logind_SOURCES = \
src/login/logind-gperf.c
-systemd_logind_CFLAGS = \
- $(libsystemd_logind_core_la_CFLAGS)
-
systemd_logind_LDADD = \
libsystemd-logind-core.la \
$(libsystemd_logind_core_la_LIBADD)
systemd_logind_LDADD = \
libsystemd-logind-core.la \
$(libsystemd_logind_core_la_LIBADD)
@@
-3808,17
+3800,13
@@
libsystemd_logind_core_la_SOURCES = \
src/login/login-shared.c \
src/login/login-shared.h
src/login/login-shared.c \
src/login/login-shared.h
-libsystemd_logind_core_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_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
+3886,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