SUBDIRS = . po
+# remove targets if the command fails
+.DELETE_ON_ERROR:
+
LIBUDEV_CURRENT=1
-LIBUDEV_REVISION=1
+LIBUDEV_REVISION=2
LIBUDEV_AGE=0
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=2
LIBGUDEV_AGE=1
-LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=4
-LIBSYSTEMD_LOGIN_AGE=2
+LIBSYSTEMD_LOGIN_CURRENT=3
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_REVISION=2
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=5
+LIBSYSTEMD_ID128_REVISION=6
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=1
-LIBSYSTEMD_JOURNAL_REVISION=1
-LIBSYSTEMD_JOURNAL_AGE=1
+LIBSYSTEMD_JOURNAL_CURRENT=2
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=2
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
rootbindir=$(rootprefix)/bin
rootlibexecdir=$(rootprefix)/lib/systemd
-CLEANFILES =
+CLEANFILES = BUILT_SOURCES
EXTRA_DIST =
BUILT_SOURCES =
INSTALL_EXEC_HOOKS =
nodist_udevrules_DATA =
dist_man_MANS =
dist_pkgsysconf_DATA =
+dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
dbusinterface_DATA =
dist_dbussystemservice_DATA =
-I $(top_srcdir)/src/login \
-I $(top_srcdir)/src/journal \
-I $(top_srcdir)/src/systemd \
+ -I $(top_builddir)/src/core \
-I $(top_srcdir)/src/core \
-I $(top_srcdir)/src/libudev \
-I $(top_srcdir)/src/udev
-DKBD_SETFONT=\"/bin/setfont\" \
-DDEFAULT_FONT=\"LatArCyrHeb-16\"
else
-if TARGET_MEEGO
-AM_CPPFLAGS += \
- -DKBD_LOADKEYS=\"/bin/loadkeys\" \
- -DKBD_SETFONT=\"/bin/setfont\" \
- -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-else
if TARGET_ANGSTROM
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
endif
endif
endif
-endif
# ------------------------------------------------------------------------------
rootbin_PROGRAMS = \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
units/syslog.target \
- units/systemd-udev-control.socket \
- units/systemd-udev-kernel.socket \
- units/systemd-timedated-ntp.target \
+ units/systemd-udevd-control.socket \
+ units/systemd-udevd-kernel.socket \
units/system-update.target
nodist_systemunit_DATA = \
units/systemd-kexec.service \
units/systemd-fsck@.service \
units/systemd-fsck-root.service \
- units/systemd-udev.service \
+ units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
- units/systemd-debug-shell.service
+ units/debug-shell.service
dist_userunit_DATA = \
units/user/default.target \
units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \
units/user@.service.in \
- units/systemd-udev.service \
+ units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
- units/systemd-debug-shell.service.in \
+ units/debug-shell.service.in \
units/systemd-hibernate.service.in \
units/systemd-suspend.service.in \
introspect.awk \
man/systemd-getty-generator.8 \
man/systemd-system-update-generator.8 \
man/systemd-fstab-generator.8 \
- man/systemd.preset.5
+ man/systemd.preset.5 \
+ man/sd-id128.3 \
+ man/sd_id128_to_string.3 \
+ man/sd_id128_randomize.3 \
+ man/sd_id128_get_machine.3 \
+ man/sd-journal.3 \
+ man/sd_journal_print.3 \
+ man/sd_journal_stream_fd.3 \
+ man/sd_journal_open.3 \
+ man/sd_journal_next.3 \
+ man/sd_journal_get_data.3 \
+ man/sd_journal_get_realtime_usec.3 \
+ man/sd_journal_get_cutoff_realtime_usec.3 \
+ man/sd_journal_get_cursor.3 \
+ man/sd_journal_get_fd.3 \
+ man/sd_journal_add_match.3 \
+ man/sd_journal_seek_head.3
MANPAGES_ALIAS = \
man/reboot.8 \
man/systemd-ask-password-wall.path.8 \
man/systemd-tmpfiles-setup.service.8 \
man/systemd-tmpfiles-clean.service.8 \
- man/systemd-tmpfiles-clean.timer.8
+ man/systemd-tmpfiles-clean.timer.8 \
+ man/sd_id128_t.3 \
+ man/SD_ID128_MAKE.3 \
+ man/SD_ID128_FORMAT_STR.3 \
+ man/SD_ID128_FORMAT_VAL.3 \
+ man/sd_id128_equal.3 \
+ man/sd_id128_from_string.3 \
+ man/sd_id128_get_boot.3 \
+ man/sd_journal_printv.3 \
+ man/sd_journal_send.3 \
+ man/sd_journal_sendv.3 \
+ man/SD_JOURNAL_SUPPRESS_LOCATION.3 \
+ man/sd_journal_open_directory.3 \
+ man/sd_journal_close.3 \
+ man/sd_journal.3 \
+ man/SD_JOURNAL_RUNTIME_ONLY.3 \
+ man/SD_JOURNAL_SYSTEM_ONLY.3 \
+ man/SD_JOURNAL_LOCAL_ONLY.3 \
+ man/sd_journal_previous.3 \
+ man/sd_journal_next_skip.3 \
+ man/sd_journal_previous_skip.3 \
+ man/SD_JOURNAL_FOREACH.3 \
+ man/SD_JOURNAL_FOREACH_BACKWARDS.3 \
+ man/sd_journal_enumerate_data.3 \
+ man/sd_journal_restart_data.3 \
+ man/SD_JOURNAL_FOREACH_DATA.3 \
+ man/sd_journal_get_monotonic_usec.3 \
+ man/sd_journal_get_cutoff_monotonic_usec.3 \
+ man/sd_journal_process.3 \
+ man/sd_journal_wait.3 \
+ man/SD_JOURNAL_NOP.3 \
+ man/SD_JOURNAL_APPEND.3 \
+ man/SD_JOURNAL_INVALIDATE.3 \
+ man/sd_journal_add_disjunction.3 \
+ man/sd_journal_flush_matches.3 \
+ man/sd_journal_seek_tail.3 \
+ man/sd_journal_seek_monotonic_usec.3 \
+ man/sd_journal_seek_realtime_usec.3 \
+ man/sd_journal_seek_cursor.3
man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8
man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8
man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8
man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8
+man/sd_id128_t.3: man/sd-id128.3
+man/SD_ID128_MAKE.3: man/sd-id128.3
+man/SD_ID128_FORMAT_STR.3: man/sd-id128.3
+man/SD_ID128_FORMAT_VAL.3: man/sd-id128.3
+man/sd_id128_equal.3: man/sd-id128.3
+man/sd_id128_from_string.3: man/sd_id128_to_string.3
+man/sd_id128_get_boot.3: man/sd_id128_get_machine.3
+man/sd_journal_printv.3: man/sd_journal_print.3
+man/sd_journal_send.3: man/sd_journal_print.3
+man/sd_journal_sendv.3: man/sd_journal_print.3
+man/SD_JOURNAL_SUPPRESS_LOCATION.3: man/sd_journal_print.3
+man/sd_journal_open_directory.3: man/sd_journal_open.3
+man/sd_journal_close.3: man/sd_journal_open.3
+man/sd_journal.3: man/sd_journal_open.3
+man/SD_JOURNAL_RUNTIME_ONLY.3: man/sd_journal_open.3
+man/SD_JOURNAL_SYSTEM_ONLY.3: man/sd_journal_open.3
+man/SD_JOURNAL_LOCAL_ONLY.3: man/sd_journal_open.3
+man/sd_journal_previous.3: man/sd_journal_next.3
+man/sd_journal_next_skip.3: man/sd_journal_next.3
+man/sd_journal_previous_skip.3: man/sd_journal_next.3
+man/SD_JOURNAL_FOREACH.3: man/sd_journal_next.3
+man/SD_JOURNAL_FOREACH_BACKWARDS.3: man/sd_journal_next.3
+man/sd_journal_enumerate_data.3: man/sd_journal_get_data.3
+man/sd_journal_restart_data.3: man/sd_journal_get_data.3
+man/SD_JOURNAL_FOREACH_DATA.3: man/sd_journal_get_data.3
+man/sd_journal_get_monotonic_usec.3: man/sd_journal_get_realtime_usec.3
+man/sd_journal_get_cutoff_monotonic_usec.3: man/sd_journal_get_cutoff_realtime_usec.3
+man/sd_journal_process.3: man/sd_journal_get_fd.3
+man/sd_journal_wait.3: man/sd_journal_get_fd.3
+man/SD_JOURNAL_NOP.3: man/sd_journal_get_fd.3
+man/SD_JOURNAL_APPEND.3: man/sd_journal_get_fd.3
+man/SD_JOURNAL_INVALIDATE.3: man/sd_journal_get_fd.3
+man/sd_journal_add_disjunction.3: man/sd_journal_add_match.3
+man/sd_journal_flush_matches.3: man/sd_journal_add_match.3
+man/sd_journal_seek_tail.3: man/sd_journal_seek_head.3
+man/sd_journal_seek_monotonic_usec.3: man/sd_journal_seek_head.3
+man/sd_journal_seek_realtime_usec.3: man/sd_journal_seek_head.3
+man/sd_journal_seek_cursor.3: man/sd_journal_seek_head.3
XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
noinst_DATA = \
${XML_FILES:.xml=.html}
+
+CLEANFILES += \
+ $(MANPAGES) \
+ $(MANPAGES_ALIAS) \
+ ${XML_FILES:.xml=.html}
+
+if HAVE_PYTHON
+noinst_DATA += \
+ man/index.html
+
+CLEANFILES += \
+ man/index.html
+
+$(builddir)/man/index.html: $(XML_FILES:.xml=.html) $(top_srcdir)/make-man-index.py
+ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+ $(PYTHON) $(top_srcdir)/make-man-index.py $(XML_FILES) > $@
+
+EXTRA_DIST += \
+ man/index.html
+endif
+
endif
EXTRA_DIST += \
$(XML_FILES) \
${XML_FILES:.xml=.html} \
$(MANPAGES) \
- $(MANPAGES_ALIAS)
+ $(MANPAGES_ALIAS) \
+ make-man-index.py
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd_shared_la_SOURCES = \
src/shared/linux/auto_dev-ioctl.h \
src/shared/linux/fanotify.h \
+ src/shared/linux/seccomp.h \
+ src/shared/linux/seccomp-bpf.h \
src/shared/missing.h \
src/shared/list.h \
src/shared/macro.h \
$(AM_CFLAGS)
libsystemd_logs_la_LIBADD = \
- libsystemd-journal.la \
- libsystemd-id128.la
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
src/core/build.h \
src/core/sysfs-show.h \
src/core/switch-root.h \
- src/core/switch-root.c
+ src/core/switch-root.c \
+ src/core/killall.h \
+ src/core/killall.c \
+ src/core/syscall-list.c \
+ src/core/syscall-list.h
nodist_libsystemd_core_la_SOURCES = \
src/core/load-fragment-gperf.c \
- src/core/load-fragment-gperf-nulstr.c
+ src/core/load-fragment-gperf-nulstr.c \
+ src/core/syscall-from-name.h \
+ src/core/syscall-to-name.h
libsystemd_core_la_CFLAGS = \
$(AM_CFLAGS) \
src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
+ $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
EXTRA_DIST += \
src/core/load-fragment-gperf.gperf.m4
CLEANFILES += \
src/core/load-fragment-gperf.gperf \
src/core/load-fragment-gperf.c \
- src/core/load-fragment-gperf-nulstr.c
+ src/core/load-fragment-gperf-nulstr.c \
+ src/core/syscall-list.txt \
+ src/core/syscall-from-name.gperf
+
+BUILT_SOURCES += \
+ src/core/syscall-from-name.h \
+ src/core/syscall-to-name.h
+
+src/core/syscall-list.txt: Makefile
+ $(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; }' > $@
+
+src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
+
+src/core/syscall-from-name.h: src/core/syscall-from-name.gperf Makefile
+ $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@
+
+src/core/syscall-to-name.h: src/core/syscall-list.txt Makefile
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[__NR_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
# ------------------------------------------------------------------------------
systemd_SOURCES = \
systemd_LDADD = \
libsystemd-core.la \
libsystemd-daemon.la \
- libsystemd-id128.la \
+ libsystemd-id128-internal.la \
libsystemd-dbus.la
dist_pkgsysconf_DATA += \
TESTS += \
test-job-type \
test-env-replace \
- test-strv
+ test-strv \
+ test-unit-name
test_engine_SOURCES = \
src/test/test-engine.c
src/core/umount.h \
src/core/shutdown.c \
src/core/mount-setup.c \
- src/core/mount-setup.h
+ src/core/mount-setup.h \
+ src/core/killall.h \
+ src/core/killall.c
systemd_shutdown_LDADD = \
libsystemd-label.la \
systemd_machine_id_setup_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
- libsystemd-id128.la
+ libsystemd-id128-internal.la
# ------------------------------------------------------------------------------
systemd_sysctl_SOURCES = \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-journal.la \
- libsystemd-id128.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la \
libsystemd-dbus.la \
libsystemd-logs.la
libsystemd-label.la \
libsystemd-capability.la \
libsystemd-shared.la \
- libsystemd-daemon.la
+ libsystemd-daemon.la \
+ libsystemd-id128-internal.la
# ------------------------------------------------------------------------------
systemd_stdio_bridge_SOURCES = \
src/libsystemd-daemon/libsystemd-daemon.pc
MANPAGES += \
- man/sd-daemon.7 \
+ man/sd-daemon.3 \
man/sd_notify.3 \
man/sd_listen_fds.3 \
man/sd_is_fifo.3 \
man/sd_is_socket_unix.3 \
man/sd_is_socket_inet.3 \
man/sd_is_mq.3 \
- man/sd_notifyf.3
+ man/sd_notifyf.3 \
+ man/SD_LISTEN_FDS_START.3 \
+ man/SD_EMERG.3 \
+ man/SD_ALERT.3 \
+ man/SD_CRIT.3 \
+ man/SD_ERR.3 \
+ man/SD_WARNING.3 \
+ man/SD_NOTICE.3 \
+ man/SD_INFO.3 \
+ man/SD_DEBUG.3
man/sd_is_socket.3: man/sd_is_fifo.3
man/sd_is_socket_unix.3: man/sd_is_fifo.3
man/sd_is_socket_inet.3: man/sd_is_fifo.3
man/sd_is_mq.3: man/sd_is_fifo.3
man/sd_notifyf.3: man/sd_notify.3
+man/SD_LISTEN_FDS_START.3: man/sd_listen_fds.3
+man/SD_EMERG.3: man/sd-daemon.3
+man/SD_ALERT.3: man/sd-daemon.3
+man/SD_CRIT.3: man/sd-daemon.3
+man/SD_ERR.3: man/sd-daemon.3
+man/SD_WARNING.3: man/sd-daemon.3
+man/SD_NOTICE.3: man/sd-daemon.3
+man/SD_INFO.3: man/sd-daemon.3
+man/SD_DEBUG.3: man/sd-daemon.3
EXTRA_DIST += \
src/libsystemd-daemon/libsystemd-daemon.pc.in \
src/udev/udev.pc
EXTRA_DIST += \
- units/systemd-udev.service.in \
+ units/systemd-udevd.service.in \
units/systemd-udev-trigger.service.in \
units/systemd-udev-settle.service.in
CLEANFILES += \
- units/systemd-udev.service \
+ units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service
systemd-install-hook:
mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
- ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket
- ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket
+ ln -sf ../systemd-udevd-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-control.socket
+ ln -sf ../systemd-udevd-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-kernel.socket
mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants
- ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev.service
+ ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service
ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
INSTALL_DATA_HOOKS += systemd-install-hook
libudev.la
test_udev_SOURCES = \
- src/test/test-udev.c \
- $(libudev_core_la_SOURCES) \
- $(libudev_private_la_SOURCES)
-
-# The test-udev program needs everything compiled with relative path
-# names for /sys, /dev, /run prefixed, pointing to our test/ directory.
-test_udev_CFLAGS = \
- -DTEST_PREFIX=\"test\" \
- $(libudev_core_la_CFLAGS) \
- $(libudev_private_la_CFLAGS)
-
-test_udev_CPPFLAGS =\
- $(libudev_core_la_CPPFLAGS)
+ src/test/test-udev.c
test_udev_LDADD = \
- libsystemd-label.la \
+ libudev-core.la \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS) \
src/gudev/seed-example-enum.js \
src/gudev/seed-example.js
-CLEANFILES += \
- $(nodist_libgudev_1_0_la_SOURCES)
-
src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list
$(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
src/udev/keymap/keyboard-force-release.sh.in
CLEANFILES += \
- $(nodist_keymap_SOURCES) \
src/udev/keymap/keys.txt \
src/udev/keymap/keys-from-name.gperf \
src/udev/keymap/keyboard-force-release.sh
keymaps-force-release/samsung-90x3a \
keymaps-force-release/common-volume-keys
-src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
+src/udev/keymap/keys.txt: Makefile
$(AM_V_at)mkdir -p src/udev/keymap
- $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+ $(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/' > $@
-src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt
+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 }' < $< > $@
src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf Makefile
libsystemd_id128_la_LIBADD = \
libsystemd-shared.la
+libsystemd_id128_internal_la_SOURCES = \
+ $(libsystemd_id128_la_SOURCES)
+
test_id128_SOURCES = \
src/test/test-id128.c
test_id128_LDADD = \
libsystemd-shared.la \
- libsystemd-id128.la
+ libsystemd-id128-internal.la
noinst_PROGRAMS += \
test-id128
lib_LTLIBRARIES += \
libsystemd-id128.la
+noinst_LTLIBRARIES += \
+ libsystemd-id128-internal.la
+
pkgconfiglib_DATA += \
src/libsystemd-id128/libsystemd-id128.pc
libsystemd-shared.la \
libsystemd-audit.la \
libsystemd-daemon.la \
- libsystemd-id128.la
+ libsystemd-id128-internal.la
if ENABLE_LOGIND
systemd_journald_LDADD += \
- libsystemd-login.la
+ libsystemd-login-internal.la
endif
if HAVE_ACL
systemd_cat_LDADD = \
libsystemd-shared.la \
- libsystemd-journal.la
+ libsystemd-journal-internal.la
journalctl_SOURCES = \
src/journal/journalctl.c
journalctl_LDADD = \
libsystemd-shared.la \
- libsystemd-journal.la \
- libsystemd-id128.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la \
libsystemd-logs.la
test_journal_SOURCES = \
- src/journal/test-journal.c \
- src/journal/sd-journal.c \
- src/journal/journal-file.c \
- src/journal/lookup3.c \
- src/journal/journal-send.c
+ src/journal/test-journal.c
test_journal_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la \
- libsystemd-id128.la
-
-if HAVE_XZ
-test_journal_SOURCES += \
- src/journal/compress.c
-
-test_journal_CFLAGS = \
- $(AM_CFLAGS) \
- $(XZ_CFLAGS)
-
-test_journal_LDADD += \
- $(XZ_LIBS)
-endif
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
test_journal_send_SOURCES = \
src/journal/test-journal-send.c
test_journal_send_LDADD = \
libsystemd-shared.la \
- libsystemd-journal.la
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
+
+test_journal_match_SOURCES = \
+ src/journal/test-journal-match.c
+
+test_journal_match_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
+
+test_journal_stream_SOURCES = \
+ src/journal/test-journal-stream.c
+
+test_journal_stream_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
libsystemd_journal_la_LIBADD = \
libsystemd-shared.la \
- libsystemd-id128.la
+ libsystemd-id128-internal.la
+
+libsystemd_journal_internal_la_SOURCES = \
+ $(libsystemd_journal_la_SOURCES)
if HAVE_XZ
libsystemd_journal_la_SOURCES += \
libsystemd_journal_la_LIBADD += \
$(XZ_LIBS)
+
+libsystemd_journal_internal_la_CFLAGS = \
+ $(AM_CFLAGS)
+ $(XZ_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD = \
+ $(XZ_LIBS)
+
endif
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
noinst_PROGRAMS += \
test-journal \
- test-journal-send
+ test-journal-send \
+ test-journal-match \
+ test-journal-stream
+
+TESTS += \
+ test-journal \
+ test-journal-match \
+ test-journal-stream
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
lib_LTLIBRARIES += \
libsystemd-journal.la
+noinst_LTLIBRARIES += \
+ libsystemd-journal-internal.la
+
rootlibexec_PROGRAMS += \
systemd-journald
units/systemd-journald.socket
nodist_systemunit_DATA += \
- units/systemd-journald.service
+ units/systemd-journald.service \
+ units/systemd-journal-flush.service
dist_pkgsysconf_DATA += \
src/journal/journald.conf
src/journal/libsystemd-journal.pc.in \
src/journal/libsystemd-journal.sym \
units/systemd-journald.service.in \
+ units/systemd-journal-flush.service.in \
src/journal/journald-gperf.gperf
CLEANFILES += \
src/journal/coredump.c
systemd_coredump_LDADD = \
- libsystemd-journal.la \
+ libsystemd-journal-internal.la \
libsystemd-label.la \
libsystemd-shared.la
if ENABLE_LOGIND
systemd_coredump_LDADD += \
- libsystemd-login.la
+ libsystemd-login-internal.la
endif
rootlibexec_PROGRAMS += \
libsystemd-daemon.la \
libudev.la
-pkginclude_HEADERS += \
+dist_doc_DATA += \
+ src/readahead/sd-readahead.c \
src/systemd/sd-readahead.h
rootlibexec_PROGRAMS += \
MANPAGES += \
man/sd_readahead.3 \
- man/sd-readahead.7 \
+ man/sd-readahead.3 \
man/systemd-readahead-replay.service.8
MANPAGES_ALIAS += \
EXTRA_DIST += \
units/systemd-localed.service.in
-dist_pkgdata_DATA = \
+dist_pkgdata_DATA += \
src/locale/kbd-model-map
dist_noinst_SCRIPT = \
src/login/test-login.c
test_login_LDADD = \
- libsystemd-login.la \
+ libsystemd-login-internal.la \
libsystemd-shared.la
test_inhibit_SOURCES = \
libsystemd_login_la_LIBADD = \
libsystemd-shared.la
+libsystemd_login_internal_la_SOURCES = \
+ $(libsystemd_login_la_SOURCES)
+
if HAVE_PAM
pam_systemd_la_SOURCES = \
src/login/pam-module.c
lib_LTLIBRARIES += \
libsystemd-login.la
+noinst_LTLIBRARIES += \
+ libsystemd-login-internal.la
+
pkgconfiglib_DATA += \
src/login/libsystemd-login.pc
MANPAGES += \
man/systemd-logind.service.8 \
man/logind.conf.5 \
- man/sd-login.7 \
+ man/sd-login.3 \
man/loginctl.1 \
man/sd_login_monitor_new.3 \
man/sd_pid_get_session.3 \
man/sd_login_monitor_unref.3 \
man/sd_login_monitor_flush.3 \
man/sd_login_monitor_get_fd.3 \
+ man/sd_login_monitor.3 \
man/sd_session_get_uid.3 \
man/sd_session_get_seat.3 \
man/sd_session_get_service.3 \
man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
+man/sd_login_monitor.3: man/sd_login_monitor_new.3
man/sd_session_get_uid.3: man/sd_session_is_active.3
man/sd_session_get_seat.3: man/sd_session_is_active.3
man/sd_session_get_service.3: man/sd_session_is_active.3
-e 's,@rootprefix\@,$(rootprefix),g' \
-e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
-e 's,@sushell\@,$(sushell),g' \
- < $< > $@ || rm $@
+ < $< > $@
units/%: units/%.in Makefile
$(SED_PROCESS)
src/%: src/%.m4
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(M4) -P $(M4_DEFINES) < $< > $@ || rm $@
+ $(M4) -P $(M4_DEFINES) < $< > $@
M4_PROCESS_SYSTEM = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@
+ $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
M4_PROCESS_USER = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ || rm $@
+ $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
units/%: units/%.m4 Makefile
$(M4_PROCESS_SYSTEM)
XSLTPROC_FLAGS = \
--nonet \
--stringparam man.output.quietly 1 \
- --stringparam funcsynopsis.style ansi
+ --stringparam funcsynopsis.style ansi \
+ --stringparam man.th.extra1.suppress 1 \
+ --stringparam man.authors.section.enabled 0 \
+ --stringparam man.copyright.section.enabled 0
XSLTPROC_PROCESS_MAN = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
man/%.8: man/%.xml
$(XSLTPROC_PROCESS_MAN)
-man/%.html: man/%.xml
+man/%.html: man/%.xml man/custom-html.xsl
$(XSLTPROC_PROCESS_HTML)
CLEANFILES += \
( cd $(DESTDIR)$(dbussessionservicedir) && \
rm -f org.freedesktop.systemd1.service && \
$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
-if TARGET_MEEGO
- $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
- ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
- rm -f network.target && \
- $(LN_S) $(systemunitdir)/network.target network.target )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
- rm -f * )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
- rm -f * )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
- rm -f * )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
- rm -f * )
-endif
if TARGET_FEDORA
( cd $(DESTDIR)$(systemunitdir) && \
rm -f display-manager.service single.service && \
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) rescue.service single.service )
- ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
if TARGET_MANDRIVA
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) prefdm.service dm.service && \
$(LN_S) rescue.service single.service )
- ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
if TARGET_DEBIAN_OR_UBUNTU
rm -f display-manager.service && \
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) prefdm.service dm.service )
- ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
install-exec-hook: $(INSTALL_EXEC_HOOKS)
~ianmdlvl / elogind.git / blobdiff