chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rpm: update RPM macros to include definitions for more drop-in directories and for...
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index da3885dbe7c3001a0aed1ec93d58075c8405f96b..7860174e52d6de8d02ce33430dfe9116275cee03 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-78,9
+78,10
@@
systemsleepdir=$(rootlibexecdir)/system-sleep
systemunitdir=$(rootprefix)/lib/systemd/system
systempresetdir=$(rootprefix)/lib/systemd/system-preset
udevlibexecdir=$(rootprefix)/lib/udev
systemunitdir=$(rootprefix)/lib/systemd/system
systempresetdir=$(rootprefix)/lib/systemd/system-preset
udevlibexecdir=$(rootprefix)/lib/udev
-udevhomedir = $(udevlibexecdir)
-udevrulesdir = $(udevlibexecdir)/rules.d
-udevhwdbdir = $(udevlibexecdir)/hwdb.d
+udevhomedir=$(udevlibexecdir)
+udevrulesdir=$(udevlibexecdir)/rules.d
+udevhwdbdir=$(udevlibexecdir)/hwdb.d
+catalogdir=$(prefix)/lib/systemd/catalog
# And these are the special ones for /
rootprefix=@rootprefix@
# And these are the special ones for /
rootprefix=@rootprefix@
@@
-1185,7
+1186,8
@@
noinst_PROGRAMS += \
test-unit-file \
test-date \
test-sleep \
test-unit-file \
test-date \
test-sleep \
- test-replace-var
+ test-replace-var \
+ test-sched-prio
TESTS += \
test-job-type \
TESTS += \
test-job-type \
@@
-1195,7
+1197,15
@@
TESTS += \
test-unit-file \
test-date \
test-sleep \
test-unit-file \
test-date \
test-sleep \
- test-replace-var
+ test-replace-var \
+ test-sched-prio
+
+EXTRA_DIST += \
+ test/sched_idle_bad.service \
+ test/sched_idle_ok.service \
+ test/sched_rr_bad.service \
+ test/sched_rr_ok.service \
+ test/sched_rr_change.service
test_engine_SOURCES = \
src/test/test-engine.c
test_engine_SOURCES = \
src/test/test-engine.c
@@
-1323,6
+1333,18
@@
test_watchdog_SOURCES = \
test_watchdog_LDADD = \
libsystemd-shared.la
test_watchdog_LDADD = \
libsystemd-shared.la
+test_sched_prio_SOURCES = \
+ src/test/test-sched-prio.c
+
+test_sched_prio_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
+
+test_sched_prio_LDADD = \
+ libsystemd-core.la \
+ libsystemd-daemon.la
+
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
src/initctl/initctl.c
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
src/initctl/initctl.c
@@
-1459,7
+1481,7
@@
systemd_detect_virt_LDADD = \
libsystemd-shared.la
systemd-detect-virt-install-hook:
libsystemd-shared.la
systemd-detect-virt-install-hook:
- $(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt ||:
+ -$(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt
INSTALL_EXEC_HOOKS += \
systemd-detect-virt-install-hook
INSTALL_EXEC_HOOKS += \
systemd-detect-virt-install-hook
@@
-1871,7
+1893,6
@@
libudev_core_la_SOURCES = \
src/udev/udev-rules.c \
src/udev/udev-ctrl.c \
src/udev/udev-builtin.c \
src/udev/udev-rules.c \
src/udev/udev-ctrl.c \
src/udev/udev-builtin.c \
- src/udev/udev-builtin-blkid.c \
src/udev/udev-builtin-btrfs.c \
src/udev/udev-builtin-firmware.c \
src/udev/udev-builtin-hwdb.c \
src/udev/udev-builtin-btrfs.c \
src/udev/udev-builtin-firmware.c \
src/udev/udev-builtin-hwdb.c \
@@
-1898,6
+1919,11
@@
libudev_core_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DFIRMWARE_PATH="$(FIRMWARE_PATH)"
$(AM_CPPFLAGS) \
-DFIRMWARE_PATH="$(FIRMWARE_PATH)"
+if HAVE_BLKID
+libudev_core_la_SOURCES += \
+ src/udev/udev-builtin-blkid.c
+endif
+
if HAVE_ACL
libudev_core_la_SOURCES += \
src/udev/udev-builtin-uaccess.c \
if HAVE_ACL
libudev_core_la_SOURCES += \
src/udev/udev-builtin-uaccess.c \
@@
-1929,6
+1955,14
@@
udevadm_LDADD = \
libudev-core.la \
libsystemd-shared.la
libudev-core.la \
libsystemd-shared.la
+# Update hwdb on installation. Do not bother if installing
+# in DESTDIR, since this is likely for packaging purposes.
+hwdb-update-hook:
+ -test -n "$(DESTDIR)" || udevadm hwdb --update
+
+INSTALL_DATA_HOOKS += \
+ hwdb-update-hook
+
# ------------------------------------------------------------------------------
TESTS += \
test/udev-test.pl \
# ------------------------------------------------------------------------------
TESTS += \
test/udev-test.pl \
@@
-2544,6
+2578,15
@@
test_mmap_cache_LDADD = \
libsystemd-shared.la \
libsystemd-journal-internal.la
libsystemd-shared.la \
libsystemd-journal-internal.la
+test_catalog_SOURCES = \
+ src/journal/test-catalog.c
+
+test_catalog_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-label.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
+
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
src/systemd/sd-journal.h \
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
src/systemd/sd-journal.h \
@@
-2558,6
+2601,8
@@
libsystemd_journal_la_SOURCES = \
src/journal/journal-send.c \
src/journal/journal-def.h \
src/journal/compress.h \
src/journal/journal-send.c \
src/journal/journal-def.h \
src/journal/compress.h \
+ src/journal/catalog.c \
+ src/journal/catalog.h \
src/journal/mmap-cache.c \
src/journal/mmap-cache.h
src/journal/mmap-cache.c \
src/journal/mmap-cache.h
@@
-2573,6
+2618,7
@@
libsystemd_journal_la_LDFLAGS = \
libsystemd_journal_la_LIBADD = \
libsystemd-shared.la \
libsystemd_journal_la_LIBADD = \
libsystemd-shared.la \
+ libsystemd-label.la \
libsystemd-id128-internal.la
libsystemd_journal_internal_la_SOURCES = \
libsystemd-id128-internal.la
libsystemd_journal_internal_la_SOURCES = \
@@
-2600,7
+2646,9
@@
libsystemd_journal_internal_la_LIBADD = \
libsystemd-label.la \
libsystemd-audit.la \
libsystemd-daemon.la \
libsystemd-label.la \
libsystemd-audit.la \
libsystemd-daemon.la \
- libudev.la
+ libudev.la \
+ libsystemd-shared.la \
+ libsystemd-label.la
nodist_libsystemd_journal_internal_la_SOURCES = \
src/journal/journald-gperf.c
nodist_libsystemd_journal_internal_la_SOURCES = \
src/journal/journald-gperf.c
@@
-2674,6
+2722,14
@@
libsystemd-journal-uninstall-hook:
UNINSTALL_EXEC_HOOKS += \
libsystemd-journal-uninstall-hook
UNINSTALL_EXEC_HOOKS += \
libsystemd-journal-uninstall-hook
+# Update catalog on installation. Do not bother if installing
+# in DESTDIR, since this is likely for packaging purposes.
+catalog-update-hook:
+ -test -n "$(DESTDIR)" || journalctl --update-catalog
+
+INSTALL_DATA_HOOKS += \
+ catalog-update-hook
+
noinst_PROGRAMS += \
test-journal \
test-journal-send \
noinst_PROGRAMS += \
test-journal \
test-journal-send \
@@
-2682,7
+2738,8
@@
noinst_PROGRAMS += \
test-journal-enum \
test-journal-stream \
test-journal-verify \
test-journal-enum \
test-journal-stream \
test-journal-verify \
- test-mmap-cache
+ test-mmap-cache \
+ test-catalog
TESTS += \
test-journal \
TESTS += \
test-journal \
@@
-2726,6
+2783,9
@@
dist_pkgsysconf_DATA += \
pkgconfiglib_DATA += \
src/journal/libsystemd-journal.pc
pkgconfiglib_DATA += \
src/journal/libsystemd-journal.pc
+dist_catalog_DATA = \
+ catalog/systemd.catalog
+
journal-install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
journal-install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
@@
-3690,6
+3750,11
@@
SED_PROCESS = \
-e 's,@userunitdir\@,$(userunitdir),g' \
-e 's,@systempresetdir\@,$(systempresetdir),g' \
-e 's,@userpresetdir\@,$(userpresetdir),g' \
-e 's,@userunitdir\@,$(userunitdir),g' \
-e 's,@systempresetdir\@,$(systempresetdir),g' \
-e 's,@userpresetdir\@,$(userpresetdir),g' \
+ -e 's,@udevhwdbdir\@,$(udevhwdbdir),g' \
+ -e 's,@udevrulesdir\@,$(udevrulesdir),g' \
+ -e 's,@catalogdir\@,$(catalogdir),g' \
+ -e 's,@tmpfilesdir\@,$(tmpfilesdir),g' \
+ -e 's,@sysctldir\@,$(sysctldir),g' \
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \