X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=36b33c2824eb49753ba8f635d7d01f9da8c9b98a;hp=23f9a7c0f4751d725d8a64864c8ca366f4c6c2a1;hb=0c11f949db8d6d9899e0c473bf1f8cca0614493e;hpb=3984d657ffcfd2b4958be9714caef414f2c1fb9e diff --git a/Makefile.am b/Makefile.am index 23f9a7c0f..36b33c282 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,29 +26,29 @@ SUBDIRS = . po # remove targets if the command fails .DELETE_ON_ERROR: -LIBUDEV_CURRENT=1 -LIBUDEV_REVISION=3 -LIBUDEV_AGE=0 +LIBUDEV_CURRENT=2 +LIBUDEV_REVISION=1 +LIBUDEV_AGE=1 LIBGUDEV_CURRENT=1 LIBGUDEV_REVISION=2 LIBGUDEV_AGE=1 LIBSYSTEMD_LOGIN_CURRENT=3 -LIBSYSTEMD_LOGIN_REVISION=1 +LIBSYSTEMD_LOGIN_REVISION=4 LIBSYSTEMD_LOGIN_AGE=3 LIBSYSTEMD_DAEMON_CURRENT=0 -LIBSYSTEMD_DAEMON_REVISION=3 +LIBSYSTEMD_DAEMON_REVISION=5 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=7 +LIBSYSTEMD_ID128_REVISION=10 LIBSYSTEMD_ID128_AGE=0 -LIBSYSTEMD_JOURNAL_CURRENT=3 +LIBSYSTEMD_JOURNAL_CURRENT=5 LIBSYSTEMD_JOURNAL_REVISION=0 -LIBSYSTEMD_JOURNAL_AGE=3 +LIBSYSTEMD_JOURNAL_AGE=5 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -65,6 +65,7 @@ rpmmacrosdir=$(sysconfdir)/rpm # Our own, non-special dirs pkgsysconfdir=$(sysconfdir)/systemd userunitdir=$(prefix)/lib/systemd/user +userpresetdir=$(prefix)/lib/systemd/user-preset tmpfilesdir=$(prefix)/lib/tmpfiles.d sysctldir=$(prefix)/lib/sysctl.d usergeneratordir=$(prefix)/lib/systemd/user-generators @@ -73,6 +74,7 @@ systemgeneratordir=$(rootlibexecdir)/system-generators systemshutdowndir=$(rootlibexecdir)/system-shutdown 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 @@ -382,6 +384,7 @@ EXTRA_DIST += \ units/debug-shell.service.in \ units/systemd-hibernate.service.in \ units/systemd-suspend.service.in \ + units/quotaon.service.in \ introspect.awk \ man/custom-html.xsl @@ -468,7 +471,7 @@ MANPAGES = \ man/systemd.conf.5 \ man/tmpfiles.d.5 \ man/hostname.5 \ - man/timezone.5 \ + man/localtime.5 \ man/machine-id.5 \ man/locale.conf.5 \ man/os-release.5 \ @@ -513,6 +516,7 @@ MANPAGES = \ man/sd_journal_get_cutoff_realtime_usec.3 \ man/sd_journal_get_cursor.3 \ man/sd_journal_get_fd.3 \ + man/sd_journal_get_usage.3 \ man/sd_journal_add_match.3 \ man/sd_journal_seek_head.3 @@ -680,8 +684,36 @@ man/index.html: make-man-index.py $(XML_FILES) $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(PYTHON) $^ > $@ +MANPAGES += \ + man/systemd.directives.5 + EXTRA_DIST += \ man/index.html + +XML_DIRECTIVE_FILES = \ + man/systemd.unit.xml \ + man/systemd.service.xml \ + man/systemd.socket.xml \ + man/systemd.mount.xml \ + man/systemd.automount.xml \ + man/systemd.swap.xml \ + man/systemd.target.xml \ + man/systemd.path.xml \ + man/systemd.timer.xml \ + man/systemd.snapshot.xml \ + man/systemd.exec.xml \ + man/systemd.kill.xml \ + man/systemd.device.xml \ + man/systemd.conf.xml \ + man/systemd.journal-fields.xml + +man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES) + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(PYTHON) $^ > $@ + +EXTRA_DIST += \ + man/systemd.directives.xml + endif endif @@ -691,7 +723,8 @@ EXTRA_DIST += \ ${XML_FILES:.xml=.html} \ $(MANPAGES) \ $(MANPAGES_ALIAS) \ - make-man-index.py + make-man-index.py \ + make-directive-index.py # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -876,6 +909,8 @@ noinst_LTLIBRARIES += \ libsystemd_core_la_SOURCES = \ src/core/unit.c \ src/core/unit.h \ + src/core/unit-printf.c \ + src/core/unit-printf.h \ src/core/job.c \ src/core/job.h \ src/core/manager.c \ @@ -944,6 +979,8 @@ libsystemd_core_la_SOURCES = \ src/core/dbus-path.h \ src/core/cgroup.c \ src/core/cgroup.h \ + src/core/selinux-access.c \ + src/core/selinux-access.h \ src/core/selinux-setup.c \ src/core/selinux-setup.h \ src/core/ima-setup.c \ @@ -1003,6 +1040,8 @@ libsystemd_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-shared.la \ libsystemd-dbus.la \ + libsystemd-audit.la \ + libsystemd-id128-internal.la \ libudev.la \ $(LIBWRAP_LIBS) \ $(PAM_LIBS) \ @@ -1030,7 +1069,7 @@ BUILT_SOURCES += \ src/core/syscall-list.txt: Makefile $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@ + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+\(?.*[0-9]+.*\)?/ { sub(/__NR_/, "", $$2); print $$2; }' > $@ src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -1117,13 +1156,16 @@ noinst_PROGRAMS += \ test-strv \ test-install \ test-watchdog \ - test-unit-name + test-unit-name \ + test-log \ + test-unit-file TESTS += \ test-job-type \ test-env-replace \ test-strv \ - test-unit-name + test-unit-name \ + test-unit-file test_engine_SOURCES = \ src/test/test-engine.c @@ -1173,6 +1215,18 @@ test_unit_name_SOURCES = \ test_unit_name_LDADD = \ libsystemd-core.la +test_unit_file_SOURCES = \ + src/test/test-unit-file.c + +test_unit_file_LDADD = \ + libsystemd-core.la + +test_log_SOURCES = \ + src/test/test-log.c + +test_log_LDADD = \ + libsystemd-core.la + test_daemon_SOURCES = \ src/test/test-daemon.c @@ -1289,7 +1343,8 @@ systemd_tmpfiles_SOURCES = \ systemd_tmpfiles_LDADD = \ libsystemd-label.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-capability.la # ------------------------------------------------------------------------------ systemd_machine_id_setup_SOURCES = \ @@ -1398,6 +1453,7 @@ systemd_remount_fs_SOURCES = \ src/core/mount-setup.h systemd_remount_fs_LDADD = \ + libsystemd-label.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ @@ -1686,6 +1742,7 @@ dist_udevrules_DATA += \ rules/60-persistent-input.rules \ rules/60-persistent-alsa.rules \ rules/60-persistent-storage.rules \ + rules/64-btrfs.rules \ rules/75-net-description.rules \ rules/75-tty-description.rules \ rules/78-sound-card.rules \ @@ -1746,6 +1803,7 @@ libudev_core_la_SOURCES = \ 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-input_id.c \ @@ -2181,6 +2239,7 @@ dist_udevkeymap_DATA = \ keymaps/module-sony \ keymaps/module-sony-old \ keymaps/module-sony-vgn \ + keymaps/module-sony-vpc \ keymaps/olpc-xo \ keymaps/onkyo \ keymaps/oqo-model2 \ @@ -2204,7 +2263,7 @@ dist_udevkeymapforcerel_DATA = \ src/udev/keymap/keys.txt: Makefile $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@ @@ -2307,29 +2366,31 @@ EXTRA_DIST += \ systemd_journald_SOURCES = \ src/journal/journald.c \ src/journal/journald.h \ - src/journal/sd-journal.c \ - src/journal/journal-file.c \ - src/journal/journal-file.h \ - src/journal/lookup3.c \ - src/journal/lookup3.h \ - src/journal/journal-rate-limit.c \ - src/journal/journal-rate-limit.h \ - src/journal/sparse-endian.h \ - src/journal/journal-def.h \ - src/journal/journal-internal.h \ - src/journal/compress.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 -systemd_journald_CFLAGS = - systemd_journald_LDADD = \ libsystemd-label.la \ libsystemd-shared.la \ libsystemd-audit.la \ libsystemd-daemon.la \ - libsystemd-id128-internal.la + libsystemd-id128-internal.la \ + libsystemd-journal-internal.la \ + libudev.la if ENABLE_LOGIND systemd_journald_LDADD += \ @@ -2341,18 +2402,6 @@ systemd_journald_LDADD += \ libsystemd-acl.la endif -if HAVE_XZ -systemd_journald_SOURCES += \ - src/journal/compress.c - -systemd_journald_CFLAGS += \ - $(AM_CFLAGS) \ - $(XZ_CFLAGS) - -systemd_journald_LDADD += \ - $(XZ_LIBS) -endif - systemd_cat_SOURCES = \ src/journal/cat.c @@ -2363,12 +2412,27 @@ systemd_cat_LDADD = \ journalctl_SOURCES = \ src/journal/journalctl.c +journalctl_CFLAGS = \ + $(AM_CFLAGS) + journalctl_LDADD = \ libsystemd-shared.la \ libsystemd-journal-internal.la \ libsystemd-id128-internal.la \ libsystemd-logs.la +if HAVE_QRENCODE +journalctl_SOURCES += \ + src/journal/journal-qrcode.c \ + src/journal/journal-qrcode.h + +journalctl_CFLAGS += \ + $(QRENCODE_CFLAGS) + +journalctl_LDADD += \ + $(QRENCODE_LIBS) +endif + test_journal_SOURCES = \ src/journal/test-journal.c @@ -2401,11 +2465,31 @@ test_journal_stream_LDADD = \ libsystemd-journal-internal.la \ libsystemd-id128-internal.la +test_journal_verify_SOURCES = \ + src/journal/test-journal-verify.c + +test_journal_verify_LDADD = \ + libsystemd-shared.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la + libsystemd_journal_la_SOURCES = \ src/journal/sd-journal.c \ + src/systemd/sd-journal.h \ src/journal/journal-file.c \ + src/journal/journal-file.h \ + src/journal/journal-vacuum.c \ + src/journal/journal-vacuum.h \ + src/journal/journal-verify.c \ + src/journal/journal-verify.h \ src/journal/lookup3.c \ - src/journal/journal-send.c + src/journal/lookup3.h \ + src/journal/journal-send.c \ + src/journal/sparse-endian.h \ + src/journal/journal-def.h \ + src/journal/compress.h \ + src/journal/mmap-cache.c \ + src/journal/mmap-cache.h libsystemd_journal_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -2424,26 +2508,51 @@ libsystemd_journal_la_LIBADD = \ libsystemd_journal_internal_la_SOURCES = \ $(libsystemd_journal_la_SOURCES) +libsystemd_journal_internal_la_CFLAGS = \ + $(AM_CFLAGS) + +libsystemd_journal_internal_la_LIBADD = + if HAVE_XZ libsystemd_journal_la_SOURCES += \ src/journal/compress.c libsystemd_journal_la_CFLAGS += \ - $(AM_CFLAGS) \ $(XZ_CFLAGS) libsystemd_journal_la_LIBADD += \ $(XZ_LIBS) -libsystemd_journal_internal_la_CFLAGS = \ - $(AM_CFLAGS) +libsystemd_journal_internal_la_CFLAGS += \ $(XZ_CFLAGS) -libsystemd_journal_internal_la_LIBADD = \ +libsystemd_journal_internal_la_LIBADD += \ $(XZ_LIBS) endif +if HAVE_GCRYPT +libsystemd_journal_la_SOURCES += \ + src/journal/journal-authenticate.c \ + src/journal/journal-authenticate.h \ + src/journal/fsprg.c \ + src/journal/fsprg.h + +libsystemd_journal_la_CFLAGS += \ + $(GCRYPT_CFLAGS) \ + -Wno-pointer-arith + +libsystemd_journal_la_LIBADD += \ + $(GCRYPT_LIBS) + +libsystemd_journal_internal_la_CFLAGS += \ + $(GCRYPT_CFLAGS) \ + -Wno-pointer-arith + +libsystemd_journal_internal_la_LIBADD += \ + $(GCRYPT_LIBS) +endif + # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libsystemd-journal-install-hook: if test "$(libdir)" != "$(rootlibdir)"; then \ @@ -2467,12 +2576,14 @@ noinst_PROGRAMS += \ test-journal \ test-journal-send \ test-journal-match \ - test-journal-stream + test-journal-stream \ + test-journal-verify TESTS += \ test-journal \ test-journal-match \ - test-journal-stream + test-journal-stream \ + test-journal-verify pkginclude_HEADERS += \ src/systemd/sd-journal.h \ @@ -2514,8 +2625,9 @@ journal-install-data-hook: rm -f systemd-journald.socket && \ $(LN_S) ../systemd-journald.socket ) ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ - rm -f systemd-journald.service && \ - $(LN_S) ../systemd-journald.service ) + rm -f systemd-journald.service systemd-journal-flush.service && \ + $(LN_S) ../systemd-journald.service && \ + $(LN_S) ../systemd-journal-flush.service ) INSTALL_DATA_HOOKS += \ journal-install-data-hook @@ -2721,6 +2833,9 @@ endif EXTRA_DIST += \ units/systemd-quotacheck.service.in +nodist_systemunit_DATA += \ + units/quotaon.service + # ------------------------------------------------------------------------------ if ENABLE_RANDOMSEED rootlibexec_PROGRAMS += \ @@ -2990,8 +3105,8 @@ dbusinterface_DATA += \ timedated-install-data-hook: $(MKDIR_P) -m 0755 \ - $(DESTDIR)$(prefix)/lib/ntp-units.d \ - $(DESTDIR)$(sysconfdir)/ntp-units.d + $(DESTDIR)$(prefix)/lib/systemd/ntp-units.d \ + $(DESTDIR)$(sysconfdir)/systemd/ntp-units.d ( cd $(DESTDIR)$(systemunitdir) && \ rm -f dbus-org.freedesktop.timedate1.service && \ $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service ) @@ -3331,6 +3446,37 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ +if HAVE_PYTHON_DEVEL + +pkgpyexec_LTLIBRARIES = \ + _journal.la + +_journal_la_SOURCES = \ + src/python-systemd/_journal.c + +_journal_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=default \ + $(PYTHON_CFLAGS) + +_journal_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -shared \ + -module \ + -avoid-version + +_journal_la_LIBADD = \ + $(PYTHON_LIBS) \ + libsystemd-journal.la + +dist_pkgpyexec_PYTHON = \ + src/python-systemd/journal.py \ + src/python-systemd/__init__.py + +endif + +# ------------------------------------------------------------------------------ + SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \ @@ -3342,6 +3488,8 @@ SED_PROCESS = \ -e 's,@pkgdatadir\@,$(pkgdatadir),g' \ -e 's,@systemunitdir\@,$(systemunitdir),g' \ -e 's,@userunitdir\@,$(userunitdir),g' \ + -e 's,@systempresetdir\@,$(systempresetdir),g' \ + -e 's,@userpresetdir\@,$(userpresetdir),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \ @@ -3354,6 +3502,8 @@ SED_PROCESS = \ -e 's,@rootprefix\@,$(rootprefix),g' \ -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \ -e 's,@sushell\@,$(sushell),g' \ + -e 's,@QUOTAON\@,$(QUOTAON),g' \ + -e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \ < $< > $@ units/%: units/%.in Makefile @@ -3419,7 +3569,7 @@ CLEANFILES += \ $(pkgconfiglib_DATA) \ $(nodist_polkitpolicy_DATA) -if HAVE_XSLTPROC +if ENABLE_MANPAGES XSLTPROC_FLAGS = \ --nonet \ --stringparam man.output.quietly 1 \ @@ -3459,7 +3609,7 @@ CLEANFILES += \ ${XML_FILES:.xml=.html} endif -DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h +DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h CLEANFILES += \ $(dbusinterface_DATA)