pkgincludedir=$(includedir)/systemd
# And these are the special ones for /
-rootdir=@rootdir@
-rootbindir=$(rootdir)/bin
-rootlibexecdir=$(rootdir)/lib/systemd
+rootprefix=@rootprefix@
+rootbindir=$(rootprefix)/bin
+rootlibexecdir=$(rootprefix)/lib/systemd
systemgeneratordir=$(rootlibexecdir)/system-generators
systemshutdowndir=$(rootlibexecdir)/system-shutdown
-systemunitdir=$(rootdir)/lib/systemd/system
+systemunitdir=$(rootprefix)/lib/systemd/system
CLEANFILES =
EXTRA_DIST =
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
+ -DROOTPREFIX=\"$(rootprefix)\" \
-DRUNTIME_DIR=\"/run\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
-DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
-I $(top_srcdir)/src \
-I $(top_srcdir)/src/readahead \
- -I $(top_srcdir)/src/login
+ -I $(top_srcdir)/src/login \
+ -I $(top_srcdir)/src/journal
if TARGET_GENTOO
AM_CPPFLAGS += \
src/polkit.h \
src/dbus-loop.h \
src/spawn-agent.h \
- src/acl-util.h
+ src/acl-util.h \
+ src/logs-show.h
MANPAGES = \
man/systemd.1 \
src/unit-name.c \
src/pager.c \
src/install.c \
- src/spawn-agent.c
+ src/spawn-agent.c \
+ src/logs-show.c
systemctl_CFLAGS = \
$(AM_CFLAGS) \
systemctl_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
+ libsystemd-journal.la \
$(DBUS_LIBS)
systemd_notify_SOURCES = \
src/acl-util.c \
src/cgroup-util.c
+nodist_systemd_journald_SOURCES = \
+ src/journal/journald-gperf.c
+
systemd_journald_CFLAGS = \
$(AM_CFLAGS) \
$(ACL_CFLAGS)
systemd_journald_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
+ libsystemd-login.la \
$(ACL_LIBS)
if HAVE_XZ
systemd_journalctl_SOURCES = \
src/journal/journalctl.c \
- src/journal/sd-journal.c \
- src/journal/journal-file.c \
- src/journal/lookup3.c \
- src/sd-id128.c \
- src/pager.c
+ src/pager.c \
+ src/logs-show.c
systemd_journalctl_LDADD = \
- libsystemd-basic.la
+ libsystemd-basic.la \
+ libsystemd-journal.la
if HAVE_XZ
systemd_journalctl_SOURCES += \
src/journal/compress.c
systemd_journalctl_CFLAGS = \
+ $(AM_CFLAGS) \
$(XZ_CFLAGS)
systemd_journalctl_LDADD += \
$(XZ_LIBS)
src/journal/compress.c
test_journal_CFLAGS = \
+ $(AM_CFLAGS) \
$(XZ_CFLAGS)
test_journal_LDADD += \
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
src/journal/journal-file.c \
- src/journal/compress.c \
src/journal/lookup3.c \
src/journal/journal-send.c
libsystemd_journal_la_CFLAGS = \
$(AM_CFLAGS) \
- $(XZ_CFLAGS) \
-fvisibility=hidden
libsystemd_journal_la_LDFLAGS = \
libsystemd_journal_la_LIBADD = \
libsystemd-basic.la \
- libsystemd-id128.la \
+ libsystemd-id128.la
+
+if HAVE_XZ
+libsystemd_journal_la_SOURCES += \
+ src/journal/compress.c
+
+libsystemd_journal_la_CFLAGS += \
+ $(XZ_CFLAGS)
+
+libsystemd_journal_la_LIBADD += \
$(XZ_LIBS)
+endif
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-journal-install-hook:
nodist_systemunit_DATA += \
units/systemd-journald.service
+dist_pkgsysconf_DATA += \
+ src/journal/systemd-journald.conf
+
pkgconfiglib_DATA += \
src/journal/libsystemd-journal.pc
journal-install-data-hook:
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir)/sockets.target.wants
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
rm -f systemd-journald.socket && \
$(LN_S) ../systemd-journald.socket )
journal-install-data-hook
EXTRA_DIST += \
+ src/journal/journald.h \
src/journal/journal-def.h \
src/journal/journal-internal.h \
src/journal/journal-file.h \
src/journal/journal-rate-limit.h \
src/journal/libsystemd-journal.pc.in \
src/journal/libsystemd-journal.sym \
- units/systemd-journald.service.in
+ units/systemd-journald.service.in \
+ src/journal/journald-gperf.gperf
+
+CLEANFILES += \
+ src/journal/journald-gperf.c
# ------------------------------------------------------------------------------
if ENABLE_BINFMT
binfmt-install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(prefix)/lib/binfmt.d \
- $(DESTDIR)$(sysconfdir)/binfmt.d
+ $(DESTDIR)$(sysconfdir)/binfmt.d \
+ $(DESTDIR)$(systemunitdir)/sysinit.target.wants
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f systemd-binfmt.service \
proc-sys-fs-binfmt_misc.automount && \
units/systemd-vconsole-setup.service
vconsole-install-data-hook:
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir)/sysinit.target.wants
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f systemd-vconsole-setup.service && \
$(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service )
libsystemd-basic.la
randomseed-install-data-hook:
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir)/shutdown.target.wants \
+ $(DESTDIR)$(systemunitdir)/sysinit.target.wants
( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
rm -f systemd-random-seed-save.service && \
$(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
libsystemd-basic.la
cryptsetup-install-data-hook:
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir)/sysinit.target.wants
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f cryptsetup.target && \
$(LN_S) ../cryptsetup.target cryptsetup.target )
src/login/org.freedesktop.login1.policy.in
logind-install-data-hook:
+ $(MKDIR_P) -m 0755 \
+ $(DESTDIR)$(systemunitdir)/multi-user.target.wants
( cd $(DESTDIR)$(systemunitdir) && \
rm -f dbus-org.freedesktop.login1.service && \
$(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
man/sd_session_get_uid.3 \
man/sd_session_get_seat.3 \
man/sd_pid_get_owner_uid.3 \
- man/sd_pid_get_service.3 \
+ man/sd_pid_get_unit.3 \
man/sd_uid_is_on_seat.3 \
man/sd_uid_get_sessions.3 \
man/sd_uid_get_seats.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_pid_get_owner_uid.3: man/sd_pid_get_session.3
-man/sd_pid_get_session.3: man/sd_pid_get_session.3
+man/sd_pid_get_unit.3: man/sd_pid_get_session.3
man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
man/sd_uid_get_sessions.3: man/sd_uid_get_state.3
man/sd_uid_get_seats.3: man/sd_uid_get_state.3
XSLTPROC_PROCESS_HTML = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) man/custom-html.xsl $<
+ $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
XSLTPROC_PROCESS_HTML_IN = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) man/custom-html.xsl $< && \
+ $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< && \
mv ${@:.in=} $@
man/%.1: man/%.xml
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
- --with-rootdir=$$dc_install_base/$(rootdir)
+ --with-rootprefix=$$dc_install_base/$(rootprefix)
upload: all distcheck
cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/