X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=503302851bb88993302f69ce325948511a7686ba;hb=ebe207d4acf38165adbc45298662982eecdb9e9f;hp=065d688ebba799767b1cf41678da1b9e028da58d;hpb=ef99aec4d25087dec995b3f00b6957dcee6b13e9;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 065d688eb..503302851 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -378,7 +378,6 @@ rootlibexec_PROGRAMS = \
 	systemd \
 	systemd-cgroups-agent \
 	systemd-initctl \
-	systemd-update-utmp \
 	systemd-shutdownd \
 	systemd-shutdown \
 	systemd-remount-fs \
@@ -387,9 +386,15 @@ rootlibexec_PROGRAMS = \
 	systemd-ac-power \
 	systemd-sysctl \
 	systemd-sleep \
+	systemd-bus-proxyd \
 	systemd-socket-proxyd \
 	systemd-update-done
 
+if HAVE_UTMP
+rootlibexec_PROGRAMS += \
+	systemd-update-utmp
+endif
+
 systemgenerator_PROGRAMS = \
 	systemd-getty-generator \
 	systemd-fstab-generator \
@@ -516,8 +521,6 @@ nodist_systemunit_DATA = \
 	units/systemd-initctl.service \
 	units/systemd-shutdownd.service \
 	units/systemd-remount-fs.service \
-	units/systemd-update-utmp.service \
-	units/systemd-update-utmp-runlevel.service \
 	units/systemd-ask-password-wall.service \
 	units/systemd-ask-password-console.service \
 	units/systemd-sysctl.service \
@@ -543,6 +546,12 @@ nodist_systemunit_DATA = \
 	units/systemd-nspawn@.service \
 	units/systemd-update-done.service
 
+if HAVE_UTMP
+nodist_systemunit_DATA += \
+	units/systemd-update-utmp.service \
+	units/systemd-update-utmp-runlevel.service
+endif
+
 dist_userunit_DATA = \
 	units/user/basic.target \
 	units/user/default.target \
@@ -720,7 +729,6 @@ EXTRA_DIST += \
 	$(man_MANS) \
 	tools/make-man-index.py \
 	tools/make-directive-index.py \
-	tools/make-man-rules.py \
 	tools/xml_helper.py
 
 # ------------------------------------------------------------------------------
@@ -804,7 +812,6 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/cgroup-show.h \
 	src/shared/unit-name.c \
 	src/shared/unit-name.h \
-	src/shared/utmp-wtmp.c \
 	src/shared/utmp-wtmp.h \
 	src/shared/watchdog.c \
 	src/shared/watchdog.h \
@@ -878,6 +885,11 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/switch-root.c \
 	src/shared/nss-util.h
 
+if HAVE_UTMP
+libsystemd_shared_la_SOURCES += \
+	src/shared/utmp-wtmp.c
+endif
+
 nodist_libsystemd_shared_la_SOURCES = \
 	src/shared/errno-from-name.h \
 	src/shared/errno-to-name.h \
@@ -1329,6 +1341,7 @@ tests += \
 	test-fileio \
 	test-time \
 	test-hashmap \
+	test-set \
 	test-list \
 	test-tables \
 	test-device-nodes \
@@ -1560,6 +1573,12 @@ test_hashmap_SOURCES = \
 test_hashmap_LDADD = \
 	libsystemd-core.la
 
+test_set_SOURCES = \
+	src/test/test-set.c
+
+test_set_LDADD = \
+	libsystemd-core.la
+
 test_xml_SOURCES = \
 	src/test/test-xml.c
 
@@ -2049,9 +2068,11 @@ endif
 dist_factory_etc_DATA = \
 	factory/etc/nsswitch.conf
 
+if HAVE_PAM
 dist_factory_pam_DATA = \
 	factory/etc/pam.d/system-auth \
 	factory/etc/pam.d/other
+endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_FIRSTBOOT
@@ -2427,10 +2448,6 @@ systemd_run_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
-if ENABLE_KDBUS
-rootlibexec_PROGRAMS += \
-	systemd-bus-proxyd
-
 systemd_bus_proxyd_SOURCES = \
 	src/bus-proxyd/bus-proxyd.c \
 	src/bus-proxyd/bus-policy.c \
@@ -2452,6 +2469,7 @@ bus-proxyd-uninstall-hook:
 INSTALL_EXEC_HOOKS += bus-proxyd-install-hook
 UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook
 
+if ENABLE_KDBUS
 nodist_systemunit_DATA += \
 	units/systemd-bus-proxyd@.service
 
@@ -3007,9 +3025,7 @@ noinst_PROGRAMS += \
 	systemd-modeset \
 	systemd-subterm
 
-unifontdatadir=$(datadir)/unifont
-
-dist_unifontdata_DATA = \
+dist_pkgdata_DATA += \
 	src/libsystemd-terminal/unifont-glyph-array.bin
 
 tests += \
@@ -3035,13 +3051,15 @@ libsystemd_terminal_la_SOURCES = \
 	src/libsystemd-terminal/sysview.h \
 	src/libsystemd-terminal/sysview-internal.h \
 	src/libsystemd-terminal/sysview.c \
+	src/libsystemd-terminal/term.h \
 	src/libsystemd-terminal/term-internal.h \
 	src/libsystemd-terminal/term-charset.c \
 	src/libsystemd-terminal/term-page.c \
 	src/libsystemd-terminal/term-parser.c \
 	src/libsystemd-terminal/term-screen.c \
 	src/libsystemd-terminal/term-wcwidth.c \
-	src/libsystemd-terminal/unifont-internal.h \
+	src/libsystemd-terminal/unifont.h \
+	src/libsystemd-terminal/unifont-def.h \
 	src/libsystemd-terminal/unifont.c
 
 libsystemd_terminal_la_LIBADD = \
@@ -4129,8 +4147,9 @@ dist_pkgsysconf_DATA += \
 
 dist_catalog_DATA = \
 	catalog/systemd.fr.catalog \
-	catalog/systemd.ru.catalog \
 	catalog/systemd.it.catalog \
+	catalog/systemd.pl.catalog \
+	catalog/systemd.ru.catalog \
 	catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \
@@ -5857,6 +5876,7 @@ SOCKETS_TARGET_WANTS += \
 	systemd-initctl.socket \
 	systemd-shutdownd.socket
 
+if HAVE_UTMP
 if HAVE_SYSV_COMPAT
 RUNLEVEL1_TARGET_WANTS += \
 	systemd-update-utmp-runlevel.service
@@ -5871,7 +5891,10 @@ RUNLEVEL5_TARGET_WANTS += \
 endif
 
 SYSINIT_TARGET_WANTS += \
-	systemd-update-utmp.service \
+	systemd-update-utmp.service
+endif
+
+SYSINIT_TARGET_WANTS += \
 	systemd-update-done.service
 
 LOCAL_FS_TARGET_WANTS += \