X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=3cb6c494c1470eba7a4023fe54b301e3d8e585cb;hb=7b4977254cdc1203b44211e00cdb3a0c318cfcf2;hp=1d7abfd61f7a40ca386eb3f4b5ebbee075b12714;hpb=d267e69da42f51ed0b34b59c0e3bc988127b95a5;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 1d7abfd61..3cb6c494c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,6 +64,7 @@ dbussessionservicedir=@dbussessionservicedir@
 dbussystemservicedir=@dbussystemservicedir@
 dbusinterfacedir=@dbusinterfacedir@
 pamlibdir=@pamlibdir@
+pamconfdir=@pamconfdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
@@ -347,8 +348,11 @@ dist_zshcompletion_DATA = \
 	shell-completion/zsh/_systemctl \
 	shell-completion/zsh/_journalctl \
 	shell-completion/zsh/_udevadm \
+	shell-completion/zsh/_kernel-install \
 	shell-completion/zsh/_systemd-nspawn \
 	shell-completion/zsh/_systemd-analyze \
+	shell-completion/zsh/_sd_hosts_or_user_at_host \
+	shell-completion/zsh/_systemd-delta \
 	shell-completion/zsh/_systemd
 
 dist_sysctl_DATA = \
@@ -1140,6 +1144,9 @@ EXTRA_DIST += \
 	test/sched_rr_ok.service \
 	test/sched_rr_change.service
 
+EXTRA_DIST += \
+	src/test/test-helper.h
+
 test_engine_SOURCES = \
 	src/test/test-engine.c
 
@@ -1338,7 +1345,8 @@ test_cgroup_util_SOURCES = \
 
 test_cgroup_util_LDADD = \
 	libsystemd-label.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	libsystemd-daemon.la
 
 test_env_replace_SOURCES = \
 	src/test/test-env-replace.c
@@ -1701,6 +1709,26 @@ bin_PROGRAMS += \
 	bootctl
 endif
 
+# ------------------------------------------------------------------------------
+if HAVE_BLKID
+systemgenerator_PROGRAMS +=  \
+	systemd-gpt-auto-generator
+
+systemd_gpt_auto_generator_SOURCES = \
+	src/gpt-auto-generator/gpt-auto-generator.c
+
+systemd_gpt_auto_generator_LDADD = \
+	libsystemd-label.la \
+	libsystemd-shared.la \
+	libsystemd-id128-internal.la \
+	libudev-private.la \
+	$(BLKID_LIBS)
+
+systemd_gpt_auto_generator_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(BLKID_CFLAGS)
+endif
+
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
 	src/rc-local-generator/rc-local-generator.c
@@ -2089,6 +2117,7 @@ libudev_la_LIBADD = \
 	libsystemd-shared.la \
 	libsystemd-label.la \
 	libsystemd-daemon-internal.la \
+	$(RT_LIBS) \
 	libsystemd-id128-internal.la
 
 pkgconfiglib_DATA += \
@@ -2260,6 +2289,7 @@ libudev_core_la_LIBADD = \
 	libudev-private.la \
 	libsystemd-label.la \
 	libsystemd-daemon-internal.la \
+	$(RT_LIBS) \
 	libsystemd-shared.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
@@ -2646,7 +2676,8 @@ libsystemd_id128_la_LDFLAGS = \
 libsystemd_id128_la_LIBADD = \
 	libsystemd-shared.la \
 	libsystemd-label.la \
-	libsystemd-daemon-internal.la
+	libsystemd-daemon-internal.la \
+	$(RT_LIBS)
 
 libsystemd_id128_internal_la_SOURCES = \
 	$(libsystemd_id128_la_SOURCES)
@@ -2656,7 +2687,8 @@ test_id128_SOURCES = \
 
 test_id128_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-id128-internal.la
+	libsystemd-id128-internal.la \
+	libsystemd-daemon.la
 
 tests += \
 	test-id128
@@ -2799,6 +2831,7 @@ test_journal_init_SOURCES = \
 test_journal_init_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-daemon-internal.la \
+	$(RT_LIBS) \
 	libsystemd-journal.la
 
 test_journal_verify_SOURCES = \
@@ -2827,6 +2860,10 @@ test_mmap_cache_LDADD = \
 test_catalog_SOURCES = \
 	src/journal/test-catalog.c
 
+test_catalog_CFLAGS = \
+	$(AM_CFLAGS) \
+	-DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
+
 test_catalog_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-label.la \
@@ -2865,6 +2902,7 @@ libsystemd_journal_la_LIBADD = \
 	libsystemd-shared.la \
 	libsystemd-label.la \
 	libsystemd-daemon-internal.la \
+	$(RT_LIBS) \
 	libsystemd-id128-internal.la
 
 libsystemd_journal_internal_la_SOURCES = \
@@ -3289,6 +3327,26 @@ endif
 EXTRA_DIST += \
 	units/systemd-random-seed.service.in
 
+# ------------------------------------------------------------------------------
+if ENABLE_BACKLIGHT
+rootlibexec_PROGRAMS += \
+	systemd-backlight
+
+nodist_systemunit_DATA += \
+	units/systemd-backlight@.service
+
+systemd_backlight_SOURCES = \
+	src/backlight/backlight.c
+
+systemd_backlight_LDADD = \
+	libsystemd-label.la \
+	libsystemd-shared.la \
+	libudev-private.la
+endif
+
+EXTRA_DIST += \
+	units/systemd-backlight@.service.in
+
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
@@ -3814,7 +3872,8 @@ libsystemd_login_la_LDFLAGS = \
 
 libsystemd_login_la_LIBADD = \
 	libsystemd-shared.la \
-	libsystemd-daemon-internal.la
+	libsystemd-daemon-internal.la \
+	$(RT_LIBS)
 
 libsystemd_login_internal_la_SOURCES = \
 	$(libsystemd_login_la_SOURCES)
@@ -3842,10 +3901,14 @@ pam_systemd_la_LIBADD = \
 	libsystemd-dbus.la \
 	libsystemd-shared.la \
 	libsystemd-daemon-internal.la \
+	$(RT_LIBS) \
 	$(PAM_LIBS)
 
 pamlib_LTLIBRARIES = \
 	pam_systemd.la
+
+dist_pamconf_DATA = \
+	src/login/systemd-user
 endif
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
@@ -4026,7 +4089,8 @@ _reader_la_LIBADD = \
 	libsystemd-journal.la \
 	libsystemd-id128.la \
 	libsystemd-shared.la \
-	libsystemd-daemon-internal.la
+	libsystemd-daemon-internal.la \
+	$(RT_LIBS)
 
 login_la_SOURCES = \
 	src/python-systemd/login.c \
@@ -4049,7 +4113,8 @@ login_la_LIBADD = \
 	libsystemd-journal.la \
 	libsystemd-login.la \
 	libsystemd-shared.la \
-	libsystemd-daemon-internal.la
+	libsystemd-daemon-internal.la \
+	$(RT_LIBS)
 
 dist_pkgpyexec_PYTHON = \
 	src/python-systemd/journal.py \
@@ -4086,6 +4151,11 @@ CLEAN_LOCAL_HOOKS += clean-sphinx
 clean-sphinx:
 	-rm -rf docs/html/python-systemd/
 
+# Remove Python stuff, e.g. to force rebuilding for a different Python version.
+clean-python:
+	-rm -rf src/python-systemd/.libs src/python-systemd/*.l[ao]
+	-rm -f _daemon.la id128.la _journal.la login.la _reader.la
+
 # ------------------------------------------------------------------------------
 substitutions = \
        '|rootlibexecdir=$(rootlibexecdir)|' \
@@ -4394,6 +4464,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
 	--with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
+	--with-pamconfdir=$$dc_install_base/$(pamconfdir) \
 	--with-rootprefix=$$dc_install_base \
 	--disable-split-usr