chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: add new system-cat tool as kind of a more powerfull BSD logger
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 2a7a38b8aa86978288dcd336eff8fa6f735a454b..d94de56ff1d27d664e31f9f003c97c87940af59d 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-366,7
+366,7
@@
EXTRA_DIST += \
units/fsck@.service.in \
units/fsck-root.service.in \
units/user@.service.in \
units/fsck@.service.in \
units/fsck-root.service.in \
units/user@.service.in \
- systemd.pc.in \
+ s
rc/s
ystemd.pc.in \
introspect.awk \
src/73-seat-late.rules.in \
src/99-systemd.rules.in \
introspect.awk \
src/73-seat-late.rules.in \
src/99-systemd.rules.in \
@@
-437,7
+437,7
@@
dist_doc_DATA = \
DISTRO_PORTING
pkgconfigdata_DATA = \
DISTRO_PORTING
pkgconfigdata_DATA = \
- systemd.pc
+ s
rc/s
ystemd.pc
# First passed through sed, followed by intltool
polkitpolicy_in_in_files = \
# First passed through sed, followed by intltool
polkitpolicy_in_in_files = \
@@
-974,6
+974,7
@@
systemctl_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
libsystemd-journal.la \
libsystemd-basic.la \
libsystemd-daemon.la \
libsystemd-journal.la \
+ libsystemd-id128.la \
$(DBUS_LIBS)
systemd_notify_SOURCES = \
$(DBUS_LIBS)
systemd_notify_SOURCES = \
@@
-1115,7
+1116,7
@@
lib_LTLIBRARIES += \
libsystemd-daemon.la
pkgconfiglib_DATA += \
libsystemd-daemon.la
pkgconfiglib_DATA += \
- libsystemd-daemon.pc
+
src/
libsystemd-daemon.pc
MANPAGES += \
man/sd-daemon.7 \
MANPAGES += \
man/sd-daemon.7 \
@@
-1138,7
+1139,7
@@
man/sd_is_mq.3: man/sd_is_fifo.3
man/sd_notifyf.3: man/sd_notify.3
EXTRA_DIST += \
man/sd_notifyf.3: man/sd_notify.3
EXTRA_DIST += \
- libsystemd-daemon.pc.in \
+
src/
libsystemd-daemon.pc.in \
src/libsystemd-daemon.sym
# ------------------------------------------------------------------------------
src/libsystemd-daemon.sym
# ------------------------------------------------------------------------------
@@
-1174,7
+1175,7
@@
lib_LTLIBRARIES += \
libsystemd-id128.la
pkgconfiglib_DATA += \
libsystemd-id128.la
pkgconfiglib_DATA += \
- libsystemd-id128.pc
+
src/
libsystemd-id128.pc
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-id128-install-hook:
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-id128-install-hook:
@@
-1196,7
+1197,7
@@
UNINSTALL_EXEC_HOOKS += \
libsystemd-id128-uninstall-hook
EXTRA_DIST += \
libsystemd-id128-uninstall-hook
EXTRA_DIST += \
- libsystemd-id128.pc.in \
+
src/
libsystemd-id128.pc.in \
src/libsystemd-id128.sym
# ------------------------------------------------------------------------------
src/libsystemd-id128.sym
# ------------------------------------------------------------------------------
@@
-1207,9
+1208,13
@@
systemd_journald_SOURCES = \
src/journal/lookup3.c \
src/journal/journal-rate-limit.c \
src/sd-id128.c \
src/journal/lookup3.c \
src/journal/journal-rate-limit.c \
src/sd-id128.c \
- src/acl-util.c \
src/cgroup-util.c
src/cgroup-util.c
+if HAVE_ACL
+systemd_journald_SOURCES += \
+ src/acl-util.c
+endif
+
nodist_systemd_journald_SOURCES = \
src/journal/journald-gperf.c
nodist_systemd_journald_SOURCES = \
src/journal/journald-gperf.c
@@
-1232,6
+1237,13
@@
systemd_journald_LDADD += \
$(XZ_LIBS)
endif
$(XZ_LIBS)
endif
+systemd_cat_SOURCES = \
+ src/journal/cat.c
+
+systemd_cat_LDADD = \
+ libsystemd-basic.la \
+ libsystemd-journal.la
+
systemd_journalctl_SOURCES = \
src/journal/journalctl.c \
src/pager.c \
systemd_journalctl_SOURCES = \
src/journal/journalctl.c \
src/pager.c \
@@
-1239,7
+1251,8
@@
systemd_journalctl_SOURCES = \
systemd_journalctl_LDADD = \
libsystemd-basic.la \
systemd_journalctl_LDADD = \
libsystemd-basic.la \
- libsystemd-journal.la
+ libsystemd-journal.la \
+ libsystemd-id128.la
if HAVE_XZ
systemd_journalctl_SOURCES += \
if HAVE_XZ
systemd_journalctl_SOURCES += \
@@
-1339,6
+1352,9
@@
rootlibexec_PROGRAMS += \
rootbin_PROGRAMS += \
systemd-journalctl
rootbin_PROGRAMS += \
systemd-journalctl
+bin_PROGRAMS += \
+ systemd-cat
+
dist_systemunit_DATA += \
units/systemd-journald.socket
dist_systemunit_DATA += \
units/systemd-journald.socket
@@
-2440,8
+2456,8
@@
DISTCHECK_CONFIGURE_FLAGS = \
--with-rootprefix=$$dc_install_base/$(rootprefix)
upload: all distcheck
--with-rootprefix=$$dc_install_base/$(rootprefix)
upload: all distcheck
- cp -v systemd-$(VERSION).tar.
bz2
/home/lennart/git.fedora/systemd/
- scp systemd-$(VERSION).tar.
bz2
fdo:/srv/www.freedesktop.org/www/software/systemd/
+ cp -v systemd-$(VERSION).tar.
xz
/home/lennart/git.fedora/systemd/
+ scp systemd-$(VERSION).tar.
xz
fdo:/srv/www.freedesktop.org/www/software/systemd/
scp man/*.html tango:public/systemd-man/
git-tag:
scp man/*.html tango:public/systemd-man/
git-tag: