chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9c5b60c
)
build-sys: remove redundant _CFLAGS assignment
author
Kay Sievers
<kay.sievers@vrfy.org>
Sat, 31 Dec 2011 15:15:38 +0000
(16:15 +0100)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Sat, 31 Dec 2011 15:15:38 +0000
(16:15 +0100)
Makefile.am
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index 119967fcd364a71aecd81c0375bd135ddf38671d..d9cbebc7dbcafb57a4a0d768c6a322ebb56aefa6 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-803,18
+803,12
@@
test_cgroup_SOURCES = \
src/test-cgroup.c \
src/cgroup-util.c
src/test-cgroup.c \
src/cgroup-util.c
-test_cgroup_CFLAGS = \
- $(AM_CFLAGS)
-
test_cgroup_LDADD = \
libsystemd-basic.la
test_env_replace_SOURCES = \
src/test-env-replace.c
test_cgroup_LDADD = \
libsystemd-basic.la
test_env_replace_SOURCES = \
src/test-env-replace.c
-test_env_replace_CFLAGS = \
- $(AM_CFLAGS)
-
test_env_replace_LDADD = \
libsystemd-basic.la
test_env_replace_LDADD = \
libsystemd-basic.la
@@
-822,9
+816,6
@@
test_strv_SOURCES = \
src/test-strv.c \
src/specifier.c
src/test-strv.c \
src/specifier.c
-test_strv_CFLAGS = \
- $(AM_CFLAGS)
-
test_strv_LDADD = \
libsystemd-basic.la
test_strv_LDADD = \
libsystemd-basic.la
@@
-881,9
+872,6
@@
systemd_update_utmp_LDADD = \
systemd_random_seed_SOURCES = \
src/random-seed.c
systemd_random_seed_SOURCES = \
src/random-seed.c
-systemd_random_seed_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_random_seed_LDADD = \
libsystemd-basic.la
systemd_random_seed_LDADD = \
libsystemd-basic.la
@@
-920,18
+908,12
@@
systemd_shutdown_LDADD = \
systemd_modules_load_SOURCES = \
src/modules-load.c
systemd_modules_load_SOURCES = \
src/modules-load.c
-systemd_modules_load_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_modules_load_LDADD = \
libsystemd-basic.la
systemd_tmpfiles_SOURCES = \
src/tmpfiles.c
systemd_modules_load_LDADD = \
libsystemd-basic.la
systemd_tmpfiles_SOURCES = \
src/tmpfiles.c
-systemd_tmpfiles_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_tmpfiles_LDADD = \
libsystemd-basic.la
systemd_tmpfiles_LDADD = \
libsystemd-basic.la
@@
-940,18
+922,12
@@
systemd_machine_id_setup_SOURCES = \
src/machine-id-main.c \
src/sd-id128.c
src/machine-id-main.c \
src/sd-id128.c
-systemd_machine_id_setup_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_machine_id_setup_LDADD = \
libsystemd-basic.la
systemd_sysctl_SOURCES = \
src/sysctl.c
systemd_machine_id_setup_LDADD = \
libsystemd-basic.la
systemd_sysctl_SOURCES = \
src/sysctl.c
-systemd_sysctl_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_sysctl_LDADD = \
libsystemd-basic.la
systemd_sysctl_LDADD = \
libsystemd-basic.la
@@
-972,18
+948,12
@@
systemd_fsck_LDADD = \
systemd_quotacheck_SOURCES = \
src/quotacheck.c
systemd_quotacheck_SOURCES = \
src/quotacheck.c
-systemd_quotacheck_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_quotacheck_LDADD = \
libsystemd-basic.la
systemd_timestamp_SOURCES = \
src/timestamp.c
systemd_quotacheck_LDADD = \
libsystemd-basic.la
systemd_timestamp_SOURCES = \
src/timestamp.c
-systemd_timestamp_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_timestamp_LDADD = \
libsystemd-basic.la
systemd_timestamp_LDADD = \
libsystemd-basic.la
@@
-1001,9
+971,6
@@
systemd_ac_power_LDADD = \
systemd_detect_virt_SOURCES = \
src/detect-virt.c
systemd_detect_virt_SOURCES = \
src/detect-virt.c
-systemd_detect_virt_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_detect_virt_LDADD = \
libsystemd-basic.la
systemd_detect_virt_LDADD = \
libsystemd-basic.la
@@
-1012,9
+979,9
@@
systemd_cryptsetup_SOURCES = \
src/ask-password-api.c
systemd_cryptsetup_CFLAGS = \
src/ask-password-api.c
systemd_cryptsetup_CFLAGS = \
+ $(AM_CFLAGS) \
$(LIBCRYPTSETUP_CFLAGS) \
$(LIBCRYPTSETUP_CFLAGS) \
- $(UDEV_CFLAGS) \
- $(AM_CFLAGS)
+ $(UDEV_CFLAGS)
systemd_cryptsetup_LDADD = \
$(LIBCRYPTSETUP_LIBS) \
systemd_cryptsetup_LDADD = \
$(LIBCRYPTSETUP_LIBS) \
@@
-1025,9
+992,6
@@
systemd_cryptsetup_generator_SOURCES = \
src/cryptsetup-generator.c \
src/unit-name.c
src/cryptsetup-generator.c \
src/unit-name.c
-systemd_cryptsetup_generator_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_cryptsetup_generator_LDADD = \
libsystemd-basic.la
systemd_cryptsetup_generator_LDADD = \
libsystemd-basic.la
@@
-1035,18
+999,12
@@
systemd_getty_generator_SOURCES = \
src/getty-generator.c \
src/unit-name.c
src/getty-generator.c \
src/unit-name.c
-systemd_getty_generator_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_getty_generator_LDADD = \
libsystemd-basic.la
systemd_rc_local_generator_SOURCES = \
src/rc-local-generator.c
systemd_getty_generator_LDADD = \
libsystemd-basic.la
systemd_rc_local_generator_SOURCES = \
src/rc-local-generator.c
-systemd_rc_local_generator_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_rc_local_generator_LDADD = \
libsystemd-basic.la
systemd_rc_local_generator_LDADD = \
libsystemd-basic.la
@@
-1054,18
+1012,12
@@
systemd_user_sessions_SOURCES = \
src/user-sessions.c \
src/cgroup-util.c
src/user-sessions.c \
src/cgroup-util.c
-systemd_user_sessions_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_user_sessions_LDADD = \
libsystemd-basic.la
systemd_vconsole_setup_SOURCES = \
src/vconsole-setup.c
systemd_user_sessions_LDADD = \
libsystemd-basic.la
systemd_vconsole_setup_SOURCES = \
src/vconsole-setup.c
-systemd_vconsole_setup_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_vconsole_setup_LDADD = \
libsystemd-basic.la
systemd_vconsole_setup_LDADD = \
libsystemd-basic.la
@@
-1074,9
+1026,6
@@
systemd_remount_api_vfs_SOURCES = \
src/mount-setup.c \
src/exit-status.c
src/mount-setup.c \
src/exit-status.c
-systemd_remount_api_vfs_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_remount_api_vfs_LDADD = \
libsystemd-basic.la
systemd_remount_api_vfs_LDADD = \
libsystemd-basic.la
@@
-1096,9
+1045,6
@@
systemd_kmsg_syslogd_SOURCES = \
src/kmsg-syslogd.c \
src/fdset.c
src/kmsg-syslogd.c \
src/fdset.c
-systemd_kmsg_syslogd_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_kmsg_syslogd_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la
systemd_kmsg_syslogd_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la
@@
-1150,9
+1096,6
@@
systemd_readahead_collect_SOURCES = \
src/readahead-collect.c \
src/readahead-common.c
src/readahead-collect.c \
src/readahead-common.c
-systemd_readahead_collect_CFLAGS = \
- $(UDEV_CFLAGS)
-
systemd_readahead_collect_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
systemd_readahead_collect_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
@@
-1163,6
+1106,7
@@
systemd_readahead_replay_SOURCES = \
src/readahead-common.c
systemd_readahead_replay_CFLAGS = \
src/readahead-common.c
systemd_readahead_replay_CFLAGS = \
+ $(AM_CFLAGS) \
$(UDEV_CFLAGS)
systemd_readahead_replay_LDADD = \
$(UDEV_CFLAGS)
systemd_readahead_replay_LDADD = \
@@
-1176,9
+1120,6
@@
systemd_cgls_SOURCES = \
src/cgroup-util.c \
src/pager.c
src/cgroup-util.c \
src/pager.c
-systemd_cgls_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_cgls_LDADD = \
libsystemd-basic.la
systemd_cgls_LDADD = \
libsystemd-basic.la
@@
-1187,9
+1128,6
@@
systemd_nspawn_SOURCES = \
src/cgroup-util.c \
src/loopback-setup.c
src/cgroup-util.c \
src/loopback-setup.c
-systemd_nspawn_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_nspawn_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la
systemd_nspawn_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la
@@
-1318,9
+1256,6
@@
test_id128_SOURCES = \
src/test-id128.c \
src/sd-id128.c
src/test-id128.c \
src/sd-id128.c
-test_id128_CFLAGS = \
- $(AM_CFLAGS)
-
test_id128_LDADD = \
libsystemd-basic.la
test_id128_LDADD = \
libsystemd-basic.la
@@
-1396,16
+1331,13
@@
systemd_journalctl_SOURCES = \
src/sd-id128.c \
src/pager.c
src/sd-id128.c \
src/pager.c
-systemd_journalctl_CFLAGS = \
- $(AM_CFLAGS)
-
systemd_journalctl_LDADD = \
libsystemd-basic.la
if HAVE_XZ
systemd_journalctl_SOURCES += \
src/journal/compress.c
systemd_journalctl_LDADD = \
libsystemd-basic.la
if HAVE_XZ
systemd_journalctl_SOURCES += \
src/journal/compress.c
-systemd_journalctl_CFLAGS
+
= \
+systemd_journalctl_CFLAGS = \
$(XZ_CFLAGS)
systemd_journalctl_LDADD += \
$(XZ_LIBS)
$(XZ_CFLAGS)
systemd_journalctl_LDADD += \
$(XZ_LIBS)
@@
-1928,7
+1860,7
@@
man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
EXTRA_DIST += \
src/login/logind-gperf.gperf \
units/systemd-logind.service.in \
EXTRA_DIST += \
src/login/logind-gperf.gperf \
units/systemd-logind.service.in \
-
src/login/libsystemd-login.pc.in \
+ src/login/libsystemd-login.pc.in \
src/login/libsystemd-login.sym \
src/login/logind.h \
src/login/logind-device.h \
src/login/libsystemd-login.sym \
src/login/logind.h \
src/login/logind-device.h \