X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=3c590094d35e3b3b2ae02886cfdcc8fc2f40ac0c;hp=e4c7e564f0657f19cec6b8ada68095c354bbb4f3;hb=d4205751d4643c272059a3728045929dd0e5e800;hpb=bd49c40537ff78060b851b85fd5fdb654f34eaf4 diff --git a/Makefile.am b/Makefile.am index e4c7e564f..3c590094d 100644 --- 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 @@ -1798,8 +1834,11 @@ dist_udevrules_DATA += \ dist_udevhwdb_DATA = \ hwdb/20-pci-vendor-product.hwdb \ + hwdb/20-pci-classes.hwdb \ hwdb/20-usb-vendor-product.hwdb \ - hwdb/20-acpi-vendor.hwdb + hwdb/20-usb-classes.hwdb \ + hwdb/20-acpi-vendor.hwdb \ + hwdb/20-OUI.hwdb udevconfdir = $(sysconfdir)/udev dist_udevconf_DATA = \ @@ -1860,6 +1899,7 @@ libudev_core_la_SOURCES = \ src/udev/udev-builtin-hwdb.c \ src/udev/udev-builtin-input_id.c \ src/udev/udev-builtin-kmod.c \ + src/udev/udev-builtin-net_id.c \ src/udev/udev-builtin-path_id.c \ src/udev/udev-builtin-usb_id.c \ src/libsystemd-daemon/sd-daemon.c @@ -2418,42 +2458,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 @@ -2510,12 +2520,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 = \ @@ -2557,6 +2566,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 \ @@ -2571,6 +2589,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 @@ -2586,15 +2606,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 += \ @@ -2663,7 +2718,8 @@ noinst_PROGRAMS += \ test-journal-enum \ test-journal-stream \ test-journal-verify \ - test-mmap-cache + test-mmap-cache \ + test-catalog TESTS += \ test-journal \ @@ -2707,6 +2763,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 \ @@ -3985,7 +4044,7 @@ distclean-local: $(DISTCLEAN_LOCAL_HOOKS) clean-local: rm -rf $(abs_srcdir)/install-tree - rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids + rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt DISTCHECK_CONFIGURE_FLAGS = \ --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \ @@ -4005,7 +4064,8 @@ 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 ) upload: all distcheck