chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: prepare release 44
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index ab5000b63fc878b60f8fd6da451c3d155e46c8ea..079c1184a572dca51ca56268282c6dcfee1bdcb8 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-21,7
+21,7
@@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = po
LIBSYSTEMD_LOGIN_CURRENT=2
SUBDIRS = po
LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=
0
+LIBSYSTEMD_LOGIN_REVISION=
1
LIBSYSTEMD_LOGIN_AGE=2
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_LOGIN_AGE=2
LIBSYSTEMD_DAEMON_CURRENT=0
@@
-29,11
+29,11
@@
LIBSYSTEMD_DAEMON_REVISION=1
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=
2
+LIBSYSTEMD_ID128_REVISION=
3
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=0
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=
2
+LIBSYSTEMD_JOURNAL_REVISION=
3
LIBSYSTEMD_JOURNAL_AGE=0
# Dirs of external packages
LIBSYSTEMD_JOURNAL_AGE=0
# Dirs of external packages
@@
-468,7
+468,8
@@
libsystemd_basic_la_SOURCES = \
src/socket-util.c \
src/log.c \
src/ratelimit.c \
src/socket-util.c \
src/log.c \
src/ratelimit.c \
- src/exit-status.c
+ src/exit-status.c \
+ src/utf8.c
libsystemd_basic_la_CFLAGS = \
$(AM_CFLAGS) \
libsystemd_basic_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-649,7
+650,8
@@
EXTRA_DIST += \
src/dbus-loop.h \
src/spawn-agent.h \
src/acl-util.h \
src/dbus-loop.h \
src/spawn-agent.h \
src/acl-util.h \
- src/logs-show.h
+ src/logs-show.h \
+ src/utf8.h
MANPAGES = \
man/systemd.1 \
MANPAGES = \
man/systemd.1 \
@@
-672,6
+674,7
@@
MANPAGES = \
man/systemd.device.5 \
man/systemd.snapshot.5 \
man/systemd.exec.5 \
man/systemd.device.5 \
man/systemd.snapshot.5 \
man/systemd.exec.5 \
+ man/systemd.special.7 \
man/daemon.7 \
man/runlevel.8 \
man/telinit.8 \
man/daemon.7 \
man/runlevel.8 \
man/telinit.8 \
@@
-688,7
+691,11
@@
MANPAGES = \
man/machine-info.5 \
man/modules-load.d.5 \
man/sysctl.d.5 \
man/machine-info.5 \
man/modules-load.d.5 \
man/sysctl.d.5 \
- man/systemd-ask-password.1
+ man/systemd-ask-password.1 \
+ man/systemd-cat.1 \
+ man/systemd-machine-id-setup.1 \
+ man/systemd-journald.conf.5 \
+ man/systemd-journalctl.1
MANPAGES_ALIAS = \
man/reboot.8 \
MANPAGES_ALIAS = \
man/reboot.8 \
@@
-699,23
+706,23
@@
man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8
man/init.1: man/systemd.1
man/poweroff.8: man/halt.8
man/init.1: man/systemd.1
+XML_FILES = \
+ ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
+
if ENABLE_MANPAGES
if ENABLE_MANPAGES
-
dist_
man_MANS = \
+man_MANS = \
$(MANPAGES) \
$(MANPAGES_ALIAS)
$(MANPAGES) \
$(MANPAGES_ALIAS)
-nodist_man_MANS = \
- man/systemd.special.7
-
-XML_FILES = \
- ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
-
-dist_noinst_DATA = \
+noinst_DATA = \
${XML_FILES:.xml=.html}
${XML_FILES:.xml=.html}
+endif
EXTRA_DIST += \
EXTRA_DIST += \
- $(XML_FILES)
-endif
+ $(XML_FILES) \
+ ${XML_FILES:.xml=.html} \
+ $(MANPAGES) \
+ $(MANPAGES_ALIAS)
systemd_SOURCES = \
src/main.c
systemd_SOURCES = \
src/main.c
@@
-2485,8
+2492,8
@@
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
- --with-rootprefix=$$dc_install_base/$(prefix)
-
+ --with-rootprefix=$$dc_install_base \
+ --disable-split-usr
upload: all distcheck
cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
upload: all distcheck
cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/