X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=2bd2898c9030c3bbb6ecc1ba0ec8b81c349d0928;hp=fe4b811c734758d48c62398226e364d6d9d09087;hb=dfc15f0ea42513f256e636ee78991e637b67be34;hpb=0bf638bafb228d8eaf429e55c0609a3802c37c5b

diff --git a/Makefile.am b/Makefile.am
index fe4b811c7..2bd2898c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,9 +38,9 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBELOGIND_CURRENT=11
+LIBELOGIND_CURRENT=12
 LIBELOGIND_REVISION=0
-LIBELOGIND_AGE=11
+LIBELOGIND_AGE=12
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -52,8 +52,6 @@ pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=@bashcompletiondir@
 zshcompletiondir=@zshcompletiondir@
-systemsleepdir=$(pkglibexecdir)/sleep.d
-systemshutdowndir=$(pkglibexecdir)/shutdown.d
 
 CGROUP_CONTROLLER=@cgroup_controller@
 PKTTYAGENT=$(bindir)/pkttyagent
@@ -65,13 +63,14 @@ udevrulesdir=@udevrulesdir@
 udevbindir=@udevbindir@
 udevlibexecdir=$(udevbindir)
 udevhomedir=$(udevlibexecdir)
+systemshutdowndir=$(rootlibexecdir)/system-shutdown
+systemsleepdir=$(rootlibexecdir)/system-sleep
 factory_pamdir = $(datadir)/factory/etc/pam.d
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
-rootlibdir=@rootlibdir@
 rootbindir=$(rootprefix)/bin
-
+rootlibexecdir=$(rootprefix)/lib/elogind
 
 EXTRA_DIST =
 BUILT_SOURCES =
@@ -121,8 +120,8 @@ CLEANFILES = $(BUILT_SOURCES) \
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
 	-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-	-DELOGIND_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER)\" \
-	-DELOGIND_CGROUP_AGENT_PATH=\"$(pkglibexecdir)/elogind-cgroups-agent\" \
+	-DSYSTEMD_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER)\" \
+	-DELOGIND_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
 	-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
 	-DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \
 	-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
@@ -131,6 +130,8 @@ AM_CPPFLAGS = \
 	-DREBOOT=\"$(REBOOT)\" \
 	-DKEXEC=\"$(KEXEC)\" \
 	-DLIBDIR=\"$(libdir)\" \
+	-DROOTLIBDIR=\"$(rootlibdir)\" \
+	-DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
 	-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
 	-I $(top_srcdir)/src \
 	-I $(top_builddir)/src/basic \
@@ -294,6 +295,8 @@ noinst_LTLIBRARIES += \
 
 libbasic_la_SOURCES = \
 	src/basic/missing.h \
+	src/basic/musl_missing.h \
+	src/basic/musl_missing.c \
 	src/basic/capability.c \
 	src/basic/capability.h \
 	src/basic/conf-files.c \
@@ -364,7 +367,9 @@ libbasic_la_SOURCES = \
 	src/basic/rm-rf.c \
 	src/basic/rm-rf.h \
 	src/basic/copy.c \
-	src/basic/copy.h
+	src/basic/copy.h \
+	src/basic/parse-printf-format.c \
+	src/basic/parse-printf-format.h
 
 nodist_libbasic_la_SOURCES = \
 	src/basic/errno-from-name.h \
@@ -400,8 +405,6 @@ libshared_la_SOURCES = \
 	src/shared/spawn-polkit-agent.h \
 	src/shared/clean-ipc.c \
 	src/shared/clean-ipc.h \
-	src/shared/cgroup-show.c \
-	src/shared/cgroup-show.h \
 	src/shared/utmp-wtmp.h \
 	src/shared/bus-util.c \
 	src/shared/bus-util.h
@@ -619,7 +622,9 @@ libelogind_core_la_SOURCES = \
 	src/login/logind-utmp.c \
 	src/login/logind-acl.h \
 	src/core/cgroup.h \
-	src/core/cgroup.c
+	src/core/cgroup.c \
+	src/core/mount-setup.h \
+	src/core/mount-setup.c
 
 libelogind_core_la_LIBADD = \
 	libshared.la
@@ -725,6 +730,8 @@ pamlib_LTLIBRARIES = \
 dist_pamconf_DATA = \
 	src/login/elogind-user
 
+EXTRA_DIST += \
+	src/login/elogind-user.m4
 endif
 
 dist_dbussystemservice_DATA += \
@@ -759,6 +766,7 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 substitutions = \
+       '|rootlibexecdir=$(rootlibexecdir)|' \
        '|rootbindir=$(rootbindir)|' \
        '|bindir=$(bindir)|' \
        '|pkgsysconfdir=$(pkgsysconfdir)|' \
@@ -941,6 +949,37 @@ dist:
 git-tag:
 	git tag -s "v$(VERSION)" -m "elogind $(VERSION)"
 
+.PHONY: git-tar
+git-tar:
+	$(AM_V_at)git archive --format=tar --prefix=elogind-$(VERSION)-raw/ HEAD | \
+		(cd /var/tmp/ && tar xf -)
+	$(AM_V_GEN)(cd /var/tmp && rm -rf elogind-$(VERSION) && $(MKDIR_P) elogind-$(VERSION) && \
+	 for f in `find elogind-$(VERSION)-raw/ -type f | cut -d '/' -f 2-` ; do \
+		$(MKDIR_P) elogind-$(VERSION)/`dirname $$f` ;            \
+		$(AWK) 'BEGIN                    { i=0;e=0      }        \
+		        /^#if\s+0\s*$$/          { i=1;next     }        \
+		        /^#else\s*$$/            {                       \
+		            { if ( i==1 ) e=1; else print }{next}        \
+			}                                                \
+		        /^#endif\s*\/\/\s*0\s*$$/ {                      \
+		            { if ( i==1 ) { i=0;e=0 } else print }{next} \
+			}                                                \
+		        /^\s*\/\/\/.*elogind.*$$/{ next         }        \
+		        /^\s*\/\/\s*#include.+$$/{ next         }        \
+		        { if ( (i==0) || (e==1) ) print         }'       \
+		          elogind-$(VERSION)-raw/$$f                     \
+		        > elogind-$(VERSION)/$$f ;                       \
+		        chmod `stat -c '%a' elogind-$(VERSION)-raw/$$f`  \
+		                            elogind-$(VERSION)/$$f ;     \
+	 done ; \
+	 for l in `find elogind-$(VERSION)-raw/ -type l | cut -d '/' -f 2-` ; do \
+		$(MKDIR_P) elogind-$(VERSION)/`dirname $$l` ; \
+		cp -P elogind-$(VERSION)-raw/$$l elogind-$(VERSION)/$$l ; \
+	 done ; \
+	 tar czf elogind-$(VERSION).tar.gz elogind-$(VERSION) ; \
+	 rm -rf elogind-$(VERSION) elogind-$(VERSION)-raw) ; \
+	$(AM_V_at)mv /var/tmp/elogind-$(VERSION).tar.gz ./
+
 .PHONY: install-tree
 install-tree: all
 	rm -rf $(abs_srcdir)/install-tree