X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=fcc3287c5906f12dd45b45312bac50be71e68288;hp=0e7c489ca0415a67370b36572b6d3deaa2e36b00;hb=64aba792f7d2af56ba5308518a270490f85f3b8b;hpb=514f4ef52f91edb3741cad88d34572d162459346

diff --git a/Makefile.am b/Makefile.am
index 0e7c489ca..fcc3287c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,8 @@ dbussessionservicedir=@dbussessionservicedir@
 dbussystemservicedir=@dbussystemservicedir@
 dbusinterfacedir=@dbusinterfacedir@
 udevrulesdir=@udevrulesdir@
+pamlibdir=@pamlibdir@
+pkgconfigdatadir=$(datadir)/pkgconfig
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
@@ -44,6 +46,8 @@ AM_CPPFLAGS = \
 	-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
 	-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
 	-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
+	-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
+	-DRUNTIME_DIR=\"$(localstatedir)/run\" \
 	-I $(top_srcdir)/src
 
 rootbin_PROGRAMS = \
@@ -69,7 +73,13 @@ noinst_PROGRAMS = \
 	test-job-type \
 	test-ns \
 	test-loopback \
-	test-daemon
+	test-daemon \
+	test-cgroup
+
+if HAVE_PAM
+pamlib_LTLIBRARIES = \
+	pam_systemd.la
+endif
 
 dist_dbuspolicy_DATA = \
 	src/org.freedesktop.systemd1.conf
@@ -157,7 +167,8 @@ EXTRA_DIST = \
 	units/session/exit.service.in \
 	LICENSE \
 	README \
-	DISTRO_PORTING
+	DISTRO_PORTING \
+	systemd.pc.in
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
@@ -200,6 +211,9 @@ dist_doc_DATA = \
 	src/sd-daemon.h \
 	src/sd-daemon.c
 
+pkgconfigdata_DATA = \
+	systemd.pc
+
 noinst_LTLIBRARIES = \
 	libsystemd-basic.la \
 	libsystemd-core.la
@@ -261,7 +275,8 @@ libsystemd_core_la_SOURCES = \
 	src/unit-name.c \
 	src/fdset.c \
 	src/namespace.c \
-	src/tcpwrap.c
+	src/tcpwrap.c \
+	src/cgroup-util.c
 
 libsystemd_core_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -292,14 +307,16 @@ EXTRA_DIST += \
 
 dist_man_MANS = \
 	man/systemd.unit.5 \
-	man/systemd.service.5
+	man/systemd.service.5 \
+	man/daemon.7
 
 nodist_man_MANS = \
 	man/systemd.special.7
 
 dist_noinst_DATA = \
 	man/systemd.unit.html \
-	man/systemd.service.html
+	man/systemd.service.html \
+	man/daemon.html
 
 nodist_noinst_DATA = \
 	man/systemd.special.html
@@ -309,7 +326,8 @@ EXTRA_DIST += \
 	man/systemd.service.xml \
 	man/systemd.special.xml.in \
 	man/systemd.special.7.in \
-	man/systemd.special.html.in
+	man/systemd.special.html.in \
+	man/daemon.xml
 
 systemd_SOURCES = \
 	src/main.c
@@ -355,6 +373,18 @@ test_daemon_SOURCES = \
 test_daemon_LDADD = \
 	libsystemd-basic.la
 
+test_cgroup_SOURCES = \
+	src/test-cgroup.c \
+	src/cgroup-util.c
+
+test_cgroup_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(CGROUP_CFLAGS)
+
+test_cgroup_LDADD = \
+	libsystemd-basic.la \
+	$(CGROUP_LIBS)
+
 systemd_logger_SOURCES = \
 	src/logger.c \
 	src/sd-daemon.c \
@@ -441,12 +471,41 @@ systemadm_LDADD = \
 	$(DBUSGLIB_LIBS) \
 	$(GTK_LIBS)
 
+pam_systemd_la_SOURCES = \
+	src/pam-module.c \
+	src/cgroup-util.c \
+	src/sd-daemon.c
+
+pam_systemd_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(CGROUP_CFLAGS) \
+	-fvisibility=hidden
+
+pam_systemd_la_LDFLAGS = \
+	-module \
+	-export-dynamic \
+	-avoid-version \
+	-shared \
+	-export-symbols-regex '^pam_sm_.*'
+
+pam_systemd_la_LIBADD = \
+	libsystemd-basic.la \
+	$(PAM_LIBS) \
+	$(CGROUP_LIBS)
+
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
 		-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
 		-e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
 		-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
+		-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
+		-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
+		-e 's,@systemunitdir\@,$(systemunitdir),g' \
+		-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+		-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+		-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
+		-e 's,@prefix\@,$(prefix),g' \
 		< $< > $@
 
 units/%: units/%.in Makefile
@@ -455,6 +514,9 @@ units/%: units/%.in Makefile
 man/%: man/%.in Makefile
 	$(SED_PROCESS)
 
+%.pc: %.pc.in Makefile
+	$(SED_PROCESS)
+
 M4_PROCESS_SYSTEM = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@
@@ -481,7 +543,8 @@ CLEANFILES = \
 	units/session/remote-fs.target \
 	units/session/exit.service \
 	man/systemd.special.7 \
-	man/systemd.special.html
+	man/systemd.special.html \
+	systemd.pc
 
 if HAVE_VALAC
 CLEANFILES += \
@@ -638,4 +701,5 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
 	--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
 	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
+	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
 	--with-rootdir=$$dc_install_base/$(rootdir)