chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
build-sys: update catalog on installation
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 2c84fe1c7e4a1d714a77655bfa977d80c2d6e966..c0eec94baf0736ed0926cbaec152674fec4b391c 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
-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@
@@ -798,6 +799,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/spawn-ask-password-agent.h \
        src/shared/specifier.c \
        src/shared/specifier.h \
+       src/shared/replace-var.c \
+       src/shared/replace-var.h \
        src/shared/spawn-polkit-agent.c \
        src/shared/spawn-polkit-agent.h \
        src/shared/hwclock.c \
@@ -1182,7 +1185,9 @@ noinst_PROGRAMS += \
        test-log \
        test-unit-file \
        test-date \
-       test-sleep
+       test-sleep \
+       test-replace-var \
+       test-sched-prio
 
 TESTS += \
        test-job-type \
@@ -1191,7 +1196,16 @@ TESTS += \
        test-unit-name \
        test-unit-file \
        test-date \
-       test-sleep
+       test-sleep \
+       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
@@ -1244,6 +1258,10 @@ test_unit_name_LDADD = \
 test_unit_file_SOURCES = \
        src/test/test-unit-file.c
 
+test_unit_file_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
 test_unit_file_LDADD = \
        libsystemd-core.la
 
@@ -1265,6 +1283,12 @@ test_sleep_SOURCES = \
 test_sleep_LDADD = \
        libsystemd-core.la
 
+test_replace_var_SOURCES = \
+       src/test/test-replace-var.c
+
+test_replace_var_LDADD = \
+       libsystemd-shared.la
+
 test_daemon_SOURCES = \
        src/test/test-daemon.c
 
@@ -1309,6 +1333,18 @@ test_watchdog_SOURCES = \
 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
@@ -1857,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-builtin-blkid.c \
        src/udev/udev-builtin-btrfs.c \
        src/udev/udev-builtin-firmware.c \
        src/udev/udev-builtin-hwdb.c \
@@ -1884,6 +1919,11 @@ libudev_core_la_CPPFLAGS = \
        $(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 \
@@ -2422,42 +2462,12 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 systemd_journald_SOURCES = \
        src/journal/journald.c \
-       src/journal/journald.h \
-       src/journal/journald-kmsg.c \
-       src/journal/journald-kmsg.h \
-       src/journal/journald-syslog.c \
-       src/journal/journald-syslog.h \
-       src/journal/journald-stream.c \
-       src/journal/journald-stream.h \
-       src/journal/journald-console.c \
-       src/journal/journald-console.h \
-       src/journal/journald-native.c \
-       src/journal/journald-native.h \
-       src/journal/journald-rate-limit.c \
-       src/journal/journald-rate-limit.h \
-       src/journal/journal-internal.h
-
-nodist_systemd_journald_SOURCES = \
-       src/journal/journald-gperf.c
+       src/journal/journald-server.h
 
 systemd_journald_LDADD = \
-       libsystemd-label.la \
-       libsystemd-shared.la \
-       libsystemd-audit.la \
-       libsystemd-daemon.la \
-       libsystemd-id128-internal.la \
        libsystemd-journal-internal.la \
-       libudev.la
-
-if ENABLE_LOGIND
-systemd_journald_LDADD += \
-       libsystemd-login-internal.la
-endif
-
-if HAVE_ACL
-systemd_journald_LDADD += \
-       libsystemd-acl.la
-endif
+       libsystemd-shared.la \
+       libsystemd-id128-internal.la
 
 systemd_cat_SOURCES = \
        src/journal/cat.c
@@ -2514,12 +2524,11 @@ test_journal_send_LDADD = \
        libsystemd-id128-internal.la
 
 test_journal_syslog_SOURCES = \
-       src/journal/test-journal-syslog.c \
-       src/journal/journald-syslog.c
+       src/journal/test-journal-syslog.c
 
 test_journal_syslog_LDADD = \
-       libsystemd-shared.la \
        libsystemd-journal-internal.la \
+       libsystemd-shared.la \
        libsystemd-id128-internal.la
 
 test_journal_match_SOURCES = \
@@ -2561,6 +2570,15 @@ test_mmap_cache_LDADD = \
        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 \
@@ -2575,6 +2593,8 @@ libsystemd_journal_la_SOURCES = \
        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
 
@@ -2590,15 +2610,50 @@ libsystemd_journal_la_LDFLAGS = \
 
 libsystemd_journal_la_LIBADD = \
        libsystemd-shared.la \
+       libsystemd-label.la \
        libsystemd-id128-internal.la
 
 libsystemd_journal_internal_la_SOURCES = \
-       $(libsystemd_journal_la_SOURCES)
+       $(libsystemd_journal_la_SOURCES) \
+       src/journal/journald-kmsg.c \
+       src/journal/journald-kmsg.h \
+       src/journal/journald-syslog.c \
+       src/journal/journald-syslog.h \
+       src/journal/journald-stream.c \
+       src/journal/journald-stream.h \
+       src/journal/journald-server.c \
+       src/journal/journald-server.h \
+       src/journal/journald-console.c \
+       src/journal/journald-console.h \
+       src/journal/journald-native.c \
+       src/journal/journald-native.h \
+       src/journal/journald-rate-limit.c \
+       src/journal/journald-rate-limit.h \
+       src/journal/journal-internal.h
 
 libsystemd_journal_internal_la_CFLAGS = \
        $(AM_CFLAGS)
 
-libsystemd_journal_internal_la_LIBADD =
+libsystemd_journal_internal_la_LIBADD = \
+       libsystemd-label.la \
+       libsystemd-audit.la \
+       libsystemd-daemon.la \
+       libudev.la \
+       libsystemd-shared.la \
+       libsystemd-label.la
+
+nodist_libsystemd_journal_internal_la_SOURCES = \
+       src/journal/journald-gperf.c
+
+if ENABLE_LOGIND
+libsystemd_journal_internal_la_LIBADD += \
+       libsystemd-login-internal.la
+endif
+
+if HAVE_ACL
+libsystemd_journal_internal_la_LIBADD += \
+       libsystemd-acl.la
+endif
 
 if HAVE_XZ
 libsystemd_journal_la_SOURCES += \
@@ -2659,6 +2714,18 @@ libsystemd-journal-uninstall-hook:
 UNINSTALL_EXEC_HOOKS += \
        libsystemd-journal-uninstall-hook
 
+# Update catalog on installation / deinstallation. Do not bother if installing
+# in DESTDIR, since this is likely for packaging purposes.
+catalog-update-hook:
+       test -n "$(DESTDIR)" || journalctl --update-catalog
+
+INSTALL_EXEC_HOOKS += \
+       catalog-update-hook
+
+UNINSTALL_EXEC_HOOKS += \
+       catalog-update-hook
+
+
 noinst_PROGRAMS += \
        test-journal \
        test-journal-send \
@@ -2667,7 +2734,8 @@ noinst_PROGRAMS += \
        test-journal-enum \
        test-journal-stream \
        test-journal-verify \
-       test-mmap-cache
+       test-mmap-cache \
+       test-catalog
 
 TESTS += \
        test-journal \
@@ -2711,6 +2779,9 @@ dist_pkgsysconf_DATA += \
 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 \
@@ -4009,7 +4080,7 @@ endif
 hwdb-update:
        ( cd hwdb && \
        wget -N http://www.linux-usb.org/usb.ids && \
-       wget -N http://pciids.sourceforge.net/v2.2/pci.ids && \
+       wget -N http://pci-ids.ucw.cz/v2.2/pci.ids && \
        wget -N http://standards.ieee.org/develop/regauth/oui/oui.txt && \
        ./ids-update.pl )
 
Unnamed repository; edit this file 'description' to name the repository.