X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=547ae0a2eaa722faf21ae1d03969200fc1783040;hp=d2bd3404ce4c29f7e448264674945f3ac90e7bf1;hb=ee4cbc2c85edacab721c710e1f99aedd5c2e3a3a;hpb=7f110ff9b8828b477e87de7b28c708cf69a3d008

diff --git a/Makefile.am b/Makefile.am
index d2bd3404c..547ae0a2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=1
 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_ID128_REVISION=2
+LIBSYSTEMD_ID128_REVISION=3
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=2
+LIBSYSTEMD_JOURNAL_REVISION=3
 LIBSYSTEMD_JOURNAL_AGE=0
 
 # Dirs of external packages
@@ -177,12 +177,6 @@ bin_PROGRAMS = \
 dist_bin_SCRIPTS = \
 	src/systemd-analyze
 
-if HAVE_GTK
-bin_PROGRAMS += \
-	systemadm \
-	systemd-gnome-ask-password-agent
-endif
-
 rootlibexec_PROGRAMS = \
 	systemd \
 	systemd-cgroups-agent \
@@ -656,7 +650,6 @@ EXTRA_DIST += \
 MANPAGES = \
 	man/systemd.1 \
 	man/systemctl.1 \
-	man/systemadm.1 \
 	man/systemd-cgls.1 \
 	man/systemd-cgtop.1 \
 	man/systemd-nspawn.1 \
@@ -691,7 +684,11 @@ MANPAGES = \
 	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 \
@@ -702,20 +699,23 @@ man/reboot.8: man/halt.8
 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
-dist_man_MANS = \
+man_MANS = \
 	$(MANPAGES) \
 	$(MANPAGES_ALIAS)
 
-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}
+endif
 
 EXTRA_DIST += \
-	$(XML_FILES)
-endif
+	$(XML_FILES) \
+	${XML_FILES:.xml=.html} \
+	$(MANPAGES) \
+	$(MANPAGES_ALIAS)
 
 systemd_SOURCES = \
 	src/main.c
@@ -1029,52 +1029,6 @@ systemd_stdio_bridge_SOURCES = \
 systemd_stdio_bridge_LDADD = \
 	libsystemd-basic.la
 
-systemadm_SOURCES = \
-	src/systemadm.vala \
-	src/systemd-interfaces.vala \
-	src/wraplabel.vala
-
-systemadm_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(GTK_CFLAGS) \
-	-Wno-unused-variable \
-	-Wno-unused-function \
-	-Wno-shadow \
-	-Wno-format-nonliteral
-
-systemadm_VALAFLAGS = \
-	--pkg=posix \
-	--pkg=gtk+-2.0 \
-	--pkg=gee-1.0 \
-	-g
-
-systemadm_LDADD = \
-	$(GTK_LIBS)
-
-systemd_gnome_ask_password_agent_SOURCES = \
-	src/gnome-ask-password-agent.vala
-
-systemd_gnome_ask_password_agent_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(LIBNOTIFY_CFLAGS) \
-	$(GTK_CFLAGS) \
-	-Wno-unused-variable \
-	-Wno-unused-function \
-	-Wno-shadow \
-	-Wno-format-nonliteral
-
-systemd_gnome_ask_password_agent_VALAFLAGS = \
-	--pkg=posix \
-	--pkg=gtk+-2.0 \
-	--pkg=linux \
-	--pkg=gio-unix-2.0 \
-	--pkg=libnotify \
-	-g
-
-systemd_gnome_ask_password_agent_LDADD = \
-	$(LIBNOTIFY_LIBS) \
-	$(GTK_LIBS)
-
 systemd_tty_ask_password_agent_SOURCES = \
 	src/tty-ask-password-agent.c \
 	src/ask-password-api.c \
@@ -2185,11 +2139,6 @@ CLEANFILES += \
 	src/load-fragment-gperf-nulstr.c \
 	src/99-systemd.rules
 
-if HAVE_VALAC
-CLEANFILES += \
-	${systemadm_SOURCES:.vala=.c}
-endif
-
 if HAVE_XSLTPROC
 XSLTPROC_FLAGS = \
 	--nonet \
@@ -2485,8 +2434,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--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/