SUBDIRS = . po
-LIBUDEV_CURRENT=1
-LIBUDEV_REVISION=2
-LIBUDEV_AGE=0
+# remove targets if the command fails
+.DELETE_ON_ERROR:
+
+LIBUDEV_CURRENT=2
+LIBUDEV_REVISION=6
+LIBUDEV_AGE=1
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=2
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=9
LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=2
+LIBSYSTEMD_DAEMON_REVISION=5
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=6
+LIBSYSTEMD_ID128_REVISION=15
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=2
+LIBSYSTEMD_JOURNAL_CURRENT=6
LIBSYSTEMD_JOURNAL_REVISION=0
-LIBSYSTEMD_JOURNAL_AGE=2
+LIBSYSTEMD_JOURNAL_AGE=6
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=$(sysconfdir)/bash_completion.d
rpmmacrosdir=$(sysconfdir)/rpm
+sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
+varlogdir=$(localstatedir)/log
# 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
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
+udevhwdbdir = $(udevlibexecdir)/hwdb.d
# And these are the special ones for /
rootprefix=@rootprefix@
rootbindir=$(rootprefix)/bin
rootlibexecdir=$(rootprefix)/lib/systemd
-CLEANFILES =
+CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST =
BUILT_SOURCES =
INSTALL_EXEC_HOOKS =
include_HEADERS =
pkgconfiglib_DATA =
polkitpolicy_in_files =
+polkitpolicy_files =
dist_udevrules_DATA =
nodist_udevrules_DATA =
dist_man_MANS =
-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
+ -I $(top_srcdir)/src/udev \
+ $(OUR_CPPFLAGS)
-AM_CFLAGS = $(WARNINGFLAGS)
-AM_LDFLAGS = $(GCLDFLAGS)
+AM_CFLAGS = $(OUR_CFLAGS)
+AM_LDFLAGS = $(OUR_LDFLAGS)
# ------------------------------------------------------------------------------
if TARGET_GENTOO
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
- -DKBD_SETFONT=\"/usr/bin/setfont\" \
- -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+ -DKBD_SETFONT=\"/usr/bin/setfont\"
else
if TARGET_ARCH
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
- -DKBD_SETFONT=\"/usr/bin/setfont\" \
- -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+ -DKBD_SETFONT=\"/usr/bin/setfont\"
else
if TARGET_FRUGALWARE
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
- -DKBD_SETFONT=\"/usr/bin/setfont\" \
- -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+ -DKBD_SETFONT=\"/usr/bin/setfont\"
else
if TARGET_MANDRIVA
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
- -DKBD_SETFONT=\"/bin/setfont\" \
- -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+ -DKBD_SETFONT=\"/bin/setfont\"
else
if TARGET_ANGSTROM
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
- -DKBD_SETFONT=\"/usr/bin/setfont\" \
- -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+ -DKBD_SETFONT=\"/usr/bin/setfont\"
else
if TARGET_MAGEIA
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
- -DKBD_SETFONT=\"/bin/setfont\" \
- -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+ -DKBD_SETFONT=\"/bin/setfont\"
else
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
- -DKBD_SETFONT=\"/bin/setfont\" \
- -DDEFAULT_FONT=\"latarcyrheb-sun16\"
+ -DKBD_SETFONT=\"/bin/setfont\"
endif
endif
endif
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
if TARGET_FEDORA
dist_systemunit_DATA += \
- units/fedora/prefdm.service \
units/fedora/rc-local.service \
units/fedora/halt-local.service
systemgenerator_PROGRAMS += \
if TARGET_MANDRIVA
dist_systemunit_DATA += \
- units/mandriva/prefdm.service \
units/fedora/rc-local.service \
units/fedora/halt-local.service
systemgenerator_PROGRAMS += \
if TARGET_MAGEIA
dist_systemunit_DATA += \
- units/mageia/prefdm.service \
units/fedora/rc-local.service \
units/fedora/halt-local.service
systemgenerator_PROGRAMS += \
man/systemd.device.5 \
man/systemd.snapshot.5 \
man/systemd.exec.5 \
+ man/systemd.kill.5 \
man/systemd.special.7 \
man/systemd.journal-fields.7 \
man/kernel-command-line.7 \
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 \
man/journald.conf.5 \
man/systemd-journald.service.8 \
man/journalctl.1 \
+ man/systemd-coredumpctl.1 \
man/systemd-inhibit.1 \
man/systemd-remount-fs.service.8 \
man/systemd-update-utmp-runlevel.service.8 \
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
+ man/sd_journal_seek_head.3 \
+ man/sd_journal_query_unique.3
MANPAGES_ALIAS = \
man/reboot.8 \
man/systemd-poweroff.service.8 \
man/systemd-reboot.service.8 \
man/systemd-kexec.service.8 \
+ man/systemd-fsck.8 \
man/systemd-fsck-root.service.8 \
man/systemd-ask-password-console.path.8 \
man/systemd-ask-password-wall.service.8 \
man/systemd-tmpfiles-clean.timer.8 \
man/sd_id128_t.3 \
man/SD_ID128_MAKE.3 \
+ man/SD_ID128_CONST_STR.3 \
man/SD_ID128_FORMAT_STR.3 \
man/SD_ID128_FORMAT_VAL.3 \
man/sd_id128_equal.3 \
man/sd_journal_printv.3 \
man/sd_journal_send.3 \
man/sd_journal_sendv.3 \
+ man/sd_journal_perror.3 \
man/SD_JOURNAL_SUPPRESS_LOCATION.3 \
man/sd_journal_open_directory.3 \
man/sd_journal_close.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/sd_journal_seek_cursor.3 \
+ man/sd_journal_test_cursor.3 \
+ man/sd_journal_enumerate_unique.3 \
+ man/sd_journal_restart_unique.3 \
+ man/SD_JOURNAL_FOREACH_UNIQUE.3
man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8
man/systemd-poweroff.service.8: man/systemd-halt.service.8
man/systemd-reboot.service.8: man/systemd-halt.service.8
man/systemd-kexec.service.8: man/systemd-halt.service.8
+man/systemd-fsck.8: man/systemd-fsck@.service.8
man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.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_CONST_STR.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_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_perror.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_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
+man/sd_journal_test_cursor.3: man/sd_journal_get_cursor.3
+man/sd_journal_enumerate_unique.3: man/sd_journal_query_unique.3
+man/sd_journal_restart_unique.3: man/sd_journal_query_unique.3
+man/SD_JOURNAL_FOREACH_UNIQUE.3: man/sd_journal_query_unique.3
XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
CLEANFILES += \
man/index.html
-man/index.html: $(XML_FILES) $(top_srcdir)/make-man-index.py
- $(AM_V_GEN)$(PYTHON) $(top_srcdir)/make-man-index.py $(XML_FILES) > $@ || rm $@
+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
${XML_FILES:.xml=.html} \
$(MANPAGES) \
$(MANPAGES_ALIAS) \
- make-man-index.py
+ make-man-index.py \
+ make-directive-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 \
src/shared/def.h \
+ src/shared/sparse-endian.h \
src/shared/util.c \
src/shared/util.h \
src/shared/virt.c \
src/shared/set.h \
src/shared/strv.c \
src/shared/strv.h \
+ src/shared/strbuf.c \
+ src/shared/strbuf.h \
src/shared/conf-parser.c \
src/shared/conf-parser.h \
src/shared/log.c \
src/shared/socket-label.c \
src/shared/label.c \
src/shared/label.h \
+ src/shared/selinux-util.c \
+ src/shared/selinux-util.h \
src/shared/mkdir.c \
src/shared/mkdir.h \
src/shared/ask-password-api.c \
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 \
src/core/load-dropin.h \
src/core/execute.c \
src/core/execute.h \
+ src/core/kill.c \
+ src/core/kill.h \
src/core/dbus.c \
src/core/dbus.h \
src/core/dbus-manager.c \
src/core/dbus-device.h \
src/core/dbus-execute.c \
src/core/dbus-execute.h \
+ src/core/dbus-kill.c \
+ src/core/dbus-kill.h \
src/core/dbus-path.c \
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 \
src/core/killall.h \
src/core/killall.c \
src/core/syscall-list.c \
- src/core/syscall-list.h
+ src/core/syscall-list.h \
+ src/core/audit-fd.c \
+ src/core/audit-fd.h
nodist_libsystemd_core_la_SOURCES = \
src/core/load-fragment-gperf.c \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-dbus.la \
+ libsystemd-audit.la \
+ libsystemd-id128-internal.la \
libudev.la \
$(LIBWRAP_LIBS) \
$(PAM_LIBS) \
$(KMOD_LIBS)
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 $@
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)$(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
src/core/load-fragment-gperf.c \
src/core/load-fragment-gperf-nulstr.c \
src/core/syscall-list.txt \
- src/core/syscall-from-name.gperf \
- src/core/syscall-from-name.h \
- src/core/syscall-to-name.h
+ 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; }' > $@ || rm $@
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(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_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@ || rm $@
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(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 < $< > $@ || rm $@
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(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 "};"}' < $< > $@ || rm $@
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[__NR_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
# ------------------------------------------------------------------------------
systemd_SOURCES = \
test-strv \
test-install \
test-watchdog \
- test-unit-name
+ test-unit-name \
+ test-log \
+ test-unit-file \
+ test-date
TESTS += \
test-job-type \
test-env-replace \
test-strv \
- test-unit-name
+ test-unit-name \
+ test-unit-file \
+ test-date
test_engine_SOURCES = \
src/test/test-engine.c
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_date_SOURCES = \
+ src/test/test-date.c
+
+test_date_LDADD = \
+ libsystemd-core.la
+
test_daemon_SOURCES = \
src/test/test-daemon.c
systemd_tmpfiles_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-capability.la
# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
systemd_detect_virt_LDADD = \
libsystemd-shared.la
+systemd-detect-virt-install-hook:
+ $(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt ||:
+
+INSTALL_EXEC_HOOKS += \
+ systemd-detect-virt-install-hook
+
# ------------------------------------------------------------------------------
systemd_delta_SOURCES = \
src/delta/delta.c
src/core/mount-setup.h
systemd_remount_fs_LDADD = \
+ libsystemd-label.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.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 = \
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-daemon-install-hook:
if test "$(libdir)" != "$(rootlibdir)"; then \
- mkdir -p $(DESTDIR)$(rootlibdir) && \
+ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libudev-install-move-hook:
if test "$(libdir)" != "$(rootlibdir)"; then \
- mkdir -p $(DESTDIR)$(rootlibdir) && \
+ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \
man/systemd-udevd.service.8
MANPAGES_ALIAS += \
- man/systemd-udevd.8
+ man/systemd-udevd.8 \
+ man/systemd-udevd-control.socket.8 \
+ man/systemd-udevd-kernel.socket.8
+
+man/systemd-udevd.8: man/systemd-udevd.service.8
+man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
+man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8
udev-confdirs:
- -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
+ -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/rules.d
+ -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/hwdb.d
INSTALL_DATA_HOOKS += udev-confdirs
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 \
rules/80-drivers.rules \
rules/95-udev-late.rules
+dist_udevhwdb_DATA = \
+ hwdb/20-pci-vendor-product.hwdb \
+ hwdb/20-usb-vendor-product.hwdb \
+ hwdb/20-acpi-vendor.hwdb
+
udevconfdir = $(sysconfdir)/udev
dist_udevconf_DATA = \
src/udev/udev.conf
units/systemd-udev-settle.service
systemd-install-hook:
- mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
+ $(MKDIR_P) $(DESTDIR)$(systemunitdir)/sockets.target.wants
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
+ $(MKDIR_P) $(DESTDIR)$(systemunitdir)/sysinit.target.wants
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
libudev_core_la_SOURCES = \
src/udev/udev.h \
+ src/udev/udev-hwdb.h \
src/udev/udev-event.c \
src/udev/udev-watch.c \
src/udev/udev-node.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 \
src/udev/udev-builtin-input_id.c \
libudev_core_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
- -DFIRMWARE_PATH="$(FIRMWARE_PATH)" \
- -DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\"
+ -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
if HAVE_ACL
libudev_core_la_SOURCES += \
src/udev/udevadm-info.c \
src/udev/udevadm-control.c \
src/udev/udevadm-monitor.c \
+ src/udev/udevadm-hwdb.c \
src/udev/udevadm-settle.c \
src/udev/udevadm-trigger.c \
src/udev/udevadm-test.c \
# packed sysfs test tree
test/sys:
- $(AM_V_GEN)mkdir -p test && tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
test-sys-distclean:
-rm -rf test/sys
pkgconfiglib_DATA += \
src/gudev/gudev-1.0.pc
-EXTRA_DIST += \
- src/gudev/gudev-1.0.pc.in
-
CLEANFILES += \
src/gudev/gudev-1.0.pc
-export-dynamic -no-undefined \
-export-symbols-regex '^g_udev_.*'
-EXTRA_DIST += \
- src/gudev/gudevmarshal.list \
- src/gudev/gudevenumtypes.h.template \
- src/gudev/gudevenumtypes.c.template \
- src/gudev/gjs-example.js \
- 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_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
src/gudev/gudevmarshal.c: src/gudev/gudevmarshal.list
- $(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)echo '#include "gudevmarshal.h"' > $@ && \
glib-genmarshal $< --prefix=g_udev_marshal --body >> $@
-src/gudev/gudevenumtypes.h: src/gudev/gudevenumtypes.h.template src/gudev/gudevenums.h
- $(AM_V_GEN)glib-mkenums --template $^ > \
- $@.tmp && mv $@.tmp $@
-
-src/gudev/gudevenumtypes.c: src/gudev/gudevenumtypes.c.template src/gudev/gudevenums.h
- $(AM_V_GEN)glib-mkenums --template $^ > \
- $@.tmp && mv $@.tmp $@
+src/gudev/gudevenumtypes.%: src/gudev/gudevenumtypes.%.template src/gudev/gudevenums.h
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)glib-mkenums --template $^ > $@
if HAVE_INTROSPECTION
-include $(INTROSPECTION_MAKEFILE)
--warn-all
src_gudev_GUdev_1_0_gir_FILES = \
- $(top_srcdir)/src/gudev/gudev.h \
- $(top_srcdir)/src/gudev/gudevtypes.h \
- $(top_srcdir)/src/gudev/gudevenums.h \
- $(or $(wildcard $(top_builddir)/src/gudev/gudevenumtypes.h),$(top_srcdir)/src/gudev/gudevenumtypes.h) \
- $(top_srcdir)/src/gudev/gudevclient.h \
- $(top_srcdir)/src/gudev/gudevdevice.h \
- $(top_srcdir)/src/gudev/gudevenumerator.h \
- $(top_srcdir)/src/gudev/gudevclient.c \
- $(top_srcdir)/src/gudev/gudevdevice.c \
- $(top_srcdir)/src/gudev/gudevenumerator.c
+ src/gudev/gudev.h \
+ src/gudev/gudevtypes.h \
+ src/gudev/gudevenums.h \
+ src/gudev/gudevenumtypes.h \
+ src/gudev/gudevclient.h \
+ src/gudev/gudevdevice.h \
+ src/gudev/gudevenumerator.h \
+ src/gudev/gudevclient.c \
+ src/gudev/gudevdevice.c \
+ src/gudev/gudevenumerator.c
INTROSPECTION_GIRS = src/gudev/GUdev-1.0.gir
INTROSPECTION_SCANNER_ARGS = --c-include=gudev/gudev.h
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libgudev-install-move-hook:
if test "$(libdir)" != "$(rootlibdir)"; then \
- mkdir -p $(DESTDIR)$(rootlibdir) && \
+ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/libgudev-1.0.so) && \
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libgudev-1.0.so && \
UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
endif
+EXTRA_DIST += \
+ src/gudev/gudev-1.0.pc.in \
+ src/gudev/gudevmarshal.list \
+ src/gudev/gudevenumtypes.h.template \
+ src/gudev/gudevenumtypes.c.template \
+ src/gudev/gjs-example.js \
+ src/gudev/seed-example-enum.js \
+ src/gudev/seed-example.js
+
+
# ------------------------------------------------------------------------------
if ENABLE_KEYMAP
keymap_SOURCES = \
TESTS += \
src/udev/keymap/check-keymaps.sh
-EXTRA_DIST += \
- src/udev/keymap/check-keymaps.sh \
- 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/module-sony \
keymaps/module-sony-old \
keymaps/module-sony-vgn \
+ keymaps/module-sony-vpc \
keymaps/olpc-xo \
keymaps/onkyo \
keymaps/oqo-model2 \
keymaps-force-release/common-volume-keys
src/udev/keymap/keys.txt: Makefile
- $(AM_V_at)mkdir -p src/udev/keymap
- $(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/' > $@ || rm $@
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(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 }' < $< > $@ || rm $@
+ $(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
- $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@ || rm $@
+ $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt Makefile
- $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@ || rm $@
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
endif
+EXTRA_DIST += \
+ src/udev/keymap/check-keymaps.sh \
+ src/udev/keymap/keyboard-force-release.sh.in
+
# ------------------------------------------------------------------------------
mtd_probe_SOURCES = \
src/udev/mtd_probe/mtd_probe.c \
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-id128-install-hook:
if test "$(libdir)" != "$(rootlibdir)"; then \
- mkdir -p $(DESTDIR)$(rootlibdir) && \
+ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-id128.so) && \
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-id128.so && \
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 += \
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
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
+
+systemd_coredumpctl_SOURCES = \
+ src/journal/coredumpctl.c
+
+systemd_coredumpctl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal.la
+
test_journal_SOURCES = \
src/journal/test-journal.c
libsystemd-journal-internal.la \
libsystemd-id128-internal.la
+test_journal_syslog_SOURCES = \
+ src/journal/test-journal-syslog.c \
+ src/journal/journald-syslog.c
+
+test_journal_syslog_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
+
test_journal_match_SOURCES = \
src/journal/test-journal-match.c
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
+
+test_mmap_cache_SOURCES = \
+ src/journal/test-mmap-cache.c
+
+test_mmap_cache_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal-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/journal-def.h \
+ src/journal/compress.h \
+ src/journal/mmap-cache.c \
+ src/journal/mmap-cache.h
libsystemd_journal_la_CFLAGS = \
$(AM_CFLAGS) \
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 \
- mkdir -p $(DESTDIR)$(rootlibdir) && \
+ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-journal.so) && \
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-journal.so && \
noinst_PROGRAMS += \
test-journal \
test-journal-send \
+ test-journal-syslog \
test-journal-match \
- test-journal-stream
+ test-journal-stream \
+ test-journal-verify \
+ test-mmap-cache
TESTS += \
test-journal \
+ test-journal-send \
+ test-journal-syslog \
test-journal-match \
- test-journal-stream
+ test-journal-stream \
+ test-journal-verify \
+ test-mmap-cache
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
journalctl
bin_PROGRAMS += \
+ systemd-coredumpctl \
systemd-cat
dist_systemunit_DATA += \
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
CLEANFILES += \
src/journal/journald-gperf.c
+if HAVE_MICROHTTPD
+
+gatewayddocumentrootdir=$(pkgdatadir)/gatewayd
+
+rootlibexec_PROGRAMS += \
+ systemd-journal-gatewayd
+
+systemd_journal_gatewayd_SOURCES = \
+ src/journal/journal-gatewayd.c
+
+systemd_journal_gatewayd_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-logs.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-daemon.la \
+ $(MICROHTTPD_LIBS)
+
+systemd_journal_gatewayd_CFLAGS = \
+ -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
+ $(AM_CFLAGS) \
+ $(MICROHTTPD_CFLAGS)
+
+dist_systemunit_DATA += \
+ units/systemd-journal-gatewayd.socket
+
+nodist_systemunit_DATA += \
+ units/systemd-journal-gatewayd.service
+
+dist_gatewayddocumentroot_DATA = \
+ src/journal/browse.html
+
+endif
+
+EXTRA_DIST += \
+ units/systemd-journal-gatewayd.service.in
+
# ------------------------------------------------------------------------------
if ENABLE_COREDUMP
systemd_coredump_SOURCES = \
sysctl_DATA = \
sysctl.d/coredump.conf
-EXTRA_DIST += \
- sysctl.d/coredump.conf.in
-
CLEANFILES += \
sysctl.d/coredump.conf
endif
+EXTRA_DIST += \
+ sysctl.d/coredump.conf.in
+
# ------------------------------------------------------------------------------
if ENABLE_BINFMT
systemd_binfmt_SOURCES = \
man/systemd-binfmt.8
man/systemd-binfmt.8: man/systemd-binfmt.service.8
+endif
EXTRA_DIST += \
units/systemd-binfmt.service.in
-endif
# ------------------------------------------------------------------------------
if ENABLE_VCONSOLE
man/systemd-vconsole-setup.8
man/systemd-vconsole-setup.8: man/systemd-vconsole-setup.service.8
+endif
EXTRA_DIST += \
units/systemd-vconsole-setup.service.in
-endif
# ------------------------------------------------------------------------------
if ENABLE_READAHEAD
units/systemd-readahead-replay.service \
units/systemd-readahead-done.service
-EXTRA_DIST += \
- units/systemd-readahead-collect.service.in \
- units/systemd-readahead-replay.service.in \
- units/systemd-readahead-done.service.in
-
MANPAGES += \
man/sd_readahead.3 \
man/sd-readahead.3 \
endif
+EXTRA_DIST += \
+ units/systemd-readahead-collect.service.in \
+ units/systemd-readahead-replay.service.in \
+ units/systemd-readahead-done.service.in
+
# ------------------------------------------------------------------------------
if ENABLE_QUOTACHECK
rootlibexec_PROGRAMS += \
nodist_systemunit_DATA += \
units/systemd-quotacheck.service
-EXTRA_DIST += \
- units/systemd-quotacheck.service.in
-
systemd_quotacheck_SOURCES = \
src/quotacheck/quotacheck.c
endif
+EXTRA_DIST += \
+ units/systemd-quotacheck.service.in
+
+nodist_systemunit_DATA += \
+ units/quotaon.service
+
# ------------------------------------------------------------------------------
if ENABLE_RANDOMSEED
rootlibexec_PROGRAMS += \
units/systemd-random-seed-save.service \
units/systemd-random-seed-load.service
-EXTRA_DIST += \
- units/systemd-random-seed-save.service.in \
- units/systemd-random-seed-load.service.in
-
systemd_random_seed_SOURCES = \
src/random-seed/random-seed.c
endif
+EXTRA_DIST += \
+ units/systemd-random-seed-save.service.in \
+ units/systemd-random-seed-load.service.in
+
# ------------------------------------------------------------------------------
if HAVE_LIBCRYPTSETUP
rootlibexec_PROGRAMS += \
dist_dbussystemservice_DATA += \
src/hostname/org.freedesktop.hostname1.service
-polkitpolicy_in_files += \
- src/hostname/org.freedesktop.hostname1.policy.in
+polkitpolicy_files += \
+ src/hostname/org.freedesktop.hostname1.policy
dbusinterface_DATA += \
org.freedesktop.hostname1.xml
man/systemd-hostnamed.8: man/systemd-hostnamed.service.8
+hostnamectl_SOURCES = \
+ src/hostname/hostnamectl.c
+
+hostnamectl_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+hostnamectl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-dbus.la \
+ libsystemd-id128-internal.la
+
+bin_PROGRAMS += \
+ hostnamectl
+
+MANPAGES += \
+ man/hostnamectl.1
+
+endif
+
+polkitpolicy_in_files += \
+ src/hostname/org.freedesktop.hostname1.policy.in
+
EXTRA_DIST += \
units/systemd-hostnamed.service.in
-endif
# ------------------------------------------------------------------------------
if ENABLE_LOCALED
dist_dbussystemservice_DATA += \
src/locale/org.freedesktop.locale1.service
-polkitpolicy_in_files += \
- src/locale/org.freedesktop.locale1.policy.in
+polkitpolicy_files += \
+ src/locale/org.freedesktop.locale1.policy
dbusinterface_DATA += \
org.freedesktop.locale1.xml
man/systemd-localed.8: man/systemd-localed.service.8
-EXTRA_DIST += \
- units/systemd-localed.service.in
-
dist_pkgdata_DATA += \
src/locale/kbd-model-map
update-kbd-model-map:
src/locale/generate-kbd-model-map > src/locale/kbd-model-map
+localectl_SOURCES = \
+ src/locale/localectl.c
+
+localectl_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+localectl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-dbus.la \
+ libsystemd-id128-internal.la
+
+bin_PROGRAMS += \
+ localectl
+
+MANPAGES += \
+ man/localectl.1
+
endif
+polkitpolicy_in_files += \
+ src/locale/org.freedesktop.locale1.policy.in
+
+EXTRA_DIST += \
+ units/systemd-localed.service.in
+
# ------------------------------------------------------------------------------
if ENABLE_TIMEDATED
systemd_timedated_SOURCES = \
nodist_systemunit_DATA += \
units/systemd-timedated.service
-polkitpolicy_in_files += \
- src/timedate/org.freedesktop.timedate1.policy.in
+polkitpolicy_files += \
+ src/timedate/org.freedesktop.timedate1.policy
org.freedesktop.timedate1.xml: systemd-timedated
$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
org.freedesktop.timedate1.xml
timedated-install-data-hook:
+ $(MKDIR_P) -m 0755 \
+ $(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 )
man/systemd-timedated.8: man/systemd-timedated.service.8
+timedatectl_SOURCES = \
+ src/timedate/timedatectl.c
+
+timedatectl_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+timedatectl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-dbus.la
+
+bin_PROGRAMS += \
+ timedatectl
+
+MANPAGES += \
+ man/timedatectl.1
+
+endif
+
+polkitpolicy_in_files += \
+ src/timedate/org.freedesktop.timedate1.policy.in
+
EXTRA_DIST += \
units/systemd-timedated.service.in
-endif
# ------------------------------------------------------------------------------
if ENABLE_LOGIND
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-login-install-hook:
if test "$(libdir)" != "$(rootlibdir)"; then \
- mkdir -p $(DESTDIR)$(rootlibdir) && \
+ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.so) && \
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \
pkgconfiglib_DATA += \
src/login/libsystemd-login.pc
-polkitpolicy_in_files += \
- src/login/org.freedesktop.login1.policy.in
+polkitpolicy_files += \
+ src/login/org.freedesktop.login1.policy
logind-install-data-hook:
$(MKDIR_P) -m 0755 \
systemd_multi_seat_x_LDADD = \
libsystemd-label.la \
- libsystemd-shared.la \
- libudev.la
+ libsystemd-shared.la
rootlibexec_PROGRAMS += \
systemd-multi-seat-x
man/systemd-user-sessions.service.8
MANPAGES_ALIAS += \
- man/systemd-logind.8 \
man/sd_login_monitor_unref.3 \
man/sd_login_monitor_flush.3 \
man/sd_login_monitor_get_fd.3 \
man/sd_session_get_uid.3 \
man/sd_session_get_seat.3 \
man/sd_session_get_service.3 \
+ man/sd_session_get_state.3 \
man/sd_session_get_type.3 \
man/sd_session_get_class.3 \
man/sd_session_get_display.3 \
man/sd_seat_can_multi_session.3 \
man/sd_get_sessions.3 \
man/sd_get_uids.3 \
+ man/systemd-logind.8 \
man/systemd-user-sessions.8
man/systemd-logind.8: man/systemd-logind.service.8
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
+man/sd_session_get_state.3: man/sd_session_is_active.3
man/sd_session_get_type.3: man/sd_session_is_active.3
man/sd_session_get_class.3: man/sd_session_is_active.3
man/sd_session_get_display.3: man/sd_session_is_active.3
man/sd_get_uids.3: man/sd_get_seats.3
man/systemd-user-sessions.8: man/systemd-user-sessions.service.8
+CLEANFILES += \
+ src/login/logind-gperf.c \
+ src/login/71-seat.rules \
+ src/login/73-seat-late.rules
+endif
+
+polkitpolicy_in_files += \
+ src/login/org.freedesktop.login1.policy.in
+
EXTRA_DIST += \
src/login/logind-gperf.gperf \
src/login/libsystemd-login.pc.in \
units/systemd-logind.service.in \
units/systemd-user-sessions.service.in
-CLEANFILES += \
- src/login/logind-gperf.c \
- src/login/71-seat.rules \
- src/login/73-seat-late.rules
+# ------------------------------------------------------------------------------
+
+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 = \
-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' \
-e 's,@rootprefix\@,$(rootprefix),g' \
-e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
-e 's,@sushell\@,$(sushell),g' \
- < $< > $@ || rm $@
+ -e 's,@KILL\@,$(KILL),g' \
+ -e 's,@QUOTAON\@,$(QUOTAON),g' \
+ -e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
+ -e 's,@SYSTEM_SYSVINIT_PATH\@,$(sysvinitdir),g' \
+ -e 's,@VARLOGDIR\@,$(varlogdir),g' \
+ < $< > $@
units/%: units/%.in Makefile
$(SED_PROCESS)
$(AM_V_GEN)chmod +x $@
src/%.c: src/%.gperf
- $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(GPERF) < $< > $@
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)$(GPERF) < $< > $@
src/%: src/%.m4
- $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(M4) -P $(M4_DEFINES) < $< > $@ || rm $@
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)$(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)
$(M4_PROCESS_USER)
nodist_polkitpolicy_DATA = \
- $(polkitpolicy_in_files:.policy.in=.policy) \
+ $(polkitpolicy_files) \
$(polkitpolicy_in_in_files:.policy.in.in=.policy)
EXTRA_DIST += \
$(pkgconfiglib_DATA) \
$(nodist_polkitpolicy_DATA)
-if HAVE_XSLTPROC
+if ENABLE_MANPAGES
XSLTPROC_FLAGS = \
--nonet \
--stringparam man.output.quietly 1 \
man/%.8: man/%.xml
$(XSLTPROC_PROCESS_MAN)
-man/%.html: man/%.xml
+man/%.html: man/%.xml man/custom-html.xsl
$(XSLTPROC_PROCESS_HTML)
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)
+if HAVE_SYSV_COMPAT
+sysvinit_DATA = \
+ docs/sysvinit/README
+
+varlog_DATA = \
+ docs/var-log/README
+
+docs/sysvinit/README: docs/sysvinit/README.in
+ $(SED_PROCESS)
+
+docs/var-log/README: docs/var-log/README.in
+ $(SED_PROCESS)
+
+EXTRA_DIST += \
+ docs/sysvinit/README.in \
+ docs/var-log/README.in
+
+CLEANFILES += \
+ docs/sysvinit/README \
+ docs/var-log/README
+
+endif
+
+
systemd-install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(tmpfilesdir) \
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 )
endif
if TARGET_MANDRIVA
( cd $(DESTDIR)$(systemunitdir) && \
rm -f display-manager.service dm.service single.service && \
- $(LN_S) prefdm.service display-manager.service && \
- $(LN_S) prefdm.service dm.service && \
$(LN_S) rescue.service single.service )
endif
if TARGET_MAGEIA
( cd $(DESTDIR)$(systemunitdir) && \
- rm -f display-manager.service && \
- $(LN_S) prefdm.service display-manager.service && \
- $(LN_S) prefdm.service dm.service )
+ rm -f display-manager.service )
endif
install-exec-hook: $(INSTALL_EXEC_HOOKS)
clean-local:
rm -rf $(abs_srcdir)/install-tree
+ rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids
DISTCHECK_CONFIGURE_FLAGS = \
+ --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
--enable-gtk-doc
endif
+hwdb-update:
+ ( cd hwdb && \
+ wget -N http://www.linux-usb.org/usb.ids && \
+ wget -N http://pciids.sourceforge.net/v2.2/pci.ids && \
+ ./ids-update.pl )
+
upload: all distcheck
cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/