chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: time - exchange some 'colons' with 'commas'
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index faff3255e7dc74514ff96c2bd1b9cd016d4d9df8..4422eb8db0d00d9cbbc7bf16ef2e1d3c660217e0 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-28,6
+28,9
@@
SUBDIRS = . po
# remove targets if the command fails
.DELETE_ON_ERROR:
# remove targets if the command fails
.DELETE_ON_ERROR:
+# keep intermediate files
+.SECONDARY:
+
LIBUDEV_CURRENT=3
LIBUDEV_REVISION=1
LIBUDEV_AGE=2
LIBUDEV_CURRENT=3
LIBUDEV_REVISION=1
LIBUDEV_AGE=2
@@
-737,6
+740,8
@@
man/SD_JOURNAL_NOP.3: man/sd_journal_get_fd.3
man/SD_JOURNAL_APPEND.3: man/sd_journal_get_fd.3
man/SD_JOURNAL_INVALIDATE.3: man/sd_journal_get_fd.3
man/sd_journal_add_disjunction.3: man/sd_journal_add_match.3
man/SD_JOURNAL_APPEND.3: man/sd_journal_get_fd.3
man/SD_JOURNAL_INVALIDATE.3: man/sd_journal_get_fd.3
man/sd_journal_add_disjunction.3: man/sd_journal_add_match.3
+man/sd_journal_get_data_threshold.3: man/sd_journal_get_data.3
+man/sd_journal_set_data_threshold.3: man/sd_journal_get_data.3
man/sd_journal_flush_matches.3: man/sd_journal_add_match.3
man/sd_journal_seek_tail.3: man/sd_journal_seek_head.3
man/sd_journal_seek_monotonic_usec.3: man/sd_journal_seek_head.3
man/sd_journal_flush_matches.3: man/sd_journal_add_match.3
man/sd_journal_seek_tail.3: man/sd_journal_seek_head.3
man/sd_journal_seek_monotonic_usec.3: man/sd_journal_seek_head.3
@@
-901,6
+906,8
@@
noinst_LTLIBRARIES += \
libsystemd_units_la_SOURCES = \
src/shared/install.c \
src/shared/install.h \
libsystemd_units_la_SOURCES = \
src/shared/install.c \
src/shared/install.h \
+ src/shared/install-printf.c \
+ src/shared/install-printf.h \
src/shared/path-lookup.c \
src/shared/path-lookup.h
src/shared/path-lookup.c \
src/shared/path-lookup.h
@@
-1323,6
+1330,10
@@
test_efivars_LDADD = \
test_unit_name_SOURCES = \
src/test/test-unit-name.c
test_unit_name_SOURCES = \
src/test/test-unit-name.c
+test_unit_name_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
test_unit_name_LDADD = \
libsystemd-core.la
test_unit_name_LDADD = \
libsystemd-core.la
@@
-1403,7
+1414,8
@@
test_strv_SOURCES = \
src/test/test-strv.c
test_strv_LDADD = \
src/test/test-strv.c
test_strv_LDADD = \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-id128-internal.la
test_install_SOURCES = \
src/test/test-install.c
test_install_SOURCES = \
src/test/test-install.c
@@
-1415,7
+1427,8
@@
test_install_CFLAGS = \
test_install_LDADD = \
libsystemd-units.la \
libsystemd-label.la \
test_install_LDADD = \
libsystemd-units.la \
libsystemd-label.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-id128-internal.la
test_watchdog_SOURCES = \
src/test/test-watchdog.c
test_watchdog_SOURCES = \
src/test/test-watchdog.c
@@
-2412,6
+2425,7
@@
dist_udevkeymap_DATA = \
keymaps/hewlett-packard-tablet \
keymaps/hewlett-packard-tx2 \
keymaps/hewlett-packard_elitebook-8440p \
keymaps/hewlett-packard-tablet \
keymaps/hewlett-packard-tx2 \
keymaps/hewlett-packard_elitebook-8440p \
+ keymaps/hewlett-packard-hdx9494nr \
keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
keymaps/inventec-symphony_6.0_7.0 \
keymaps/lenovo-3000 \
keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
keymaps/inventec-symphony_6.0_7.0 \
keymaps/lenovo-3000 \
@@
-3865,19
+3879,13
@@
src/%: src/%.m4
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
-M4_PROCESS_SYSTEM = \
- $(AM_V_M4)$(MKDIR_P) $(dir $@) && \
- $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
-
-M4_PROCESS_USER = \
- $(AM_V_M4)$(MKDIR_P) $(dir $@) && \
- $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
-
units/%: units/%.m4 Makefile
units/%: units/%.m4 Makefile
- $(M4_PROCESS_SYSTEM)
+ $(AM_V_M4)$(MKDIR_P) $(dir $@)
+ $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
units/user/%: units/%.m4 Makefile
units/user/%: units/%.m4 Makefile
- $(M4_PROCESS_USER)
+ $(AM_V_M4)$(MKDIR_P) $(dir $@)
+ $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
nodist_polkitpolicy_DATA = \
$(polkitpolicy_files) \
nodist_polkitpolicy_DATA = \
$(polkitpolicy_files) \