X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=b7cae64e553930df7261a5a7704fdf580ac3b952;hp=f91734b5adae31c05afb163ab4cc802be76c9de9;hb=61311e4954c596ad17a59c52b05dd8a6a4f81909;hpb=3c55423a96cf68ea1c947b512123de2f0bc95ec0

diff --git a/Makefile.am b/Makefile.am
index f91734b5a..b7cae64e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,7 +121,7 @@ CLEANFILES = $(BUILT_SOURCES) \
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
 	-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-	-DELOGIND_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER)\" \
+	-DSYSTEMD_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER)\" \
 	-DELOGIND_CGROUP_AGENT_PATH=\"$(pkglibexecdir)/elogind-cgroups-agent\" \
 	-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
 	-DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \
@@ -294,6 +294,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 +366,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 \
@@ -619,7 +623,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 +731,8 @@ pamlib_LTLIBRARIES = \
 dist_pamconf_DATA = \
 	src/login/elogind-user
 
+EXTRA_DIST += \
+	src/login/elogind-user.m4
 endif
 
 dist_dbussystemservice_DATA += \
@@ -943,15 +951,26 @@ git-tag:
 
 .PHONY: git-tar
 git-tar:
-	git archive --format=tar --prefix=elogind-$(VERSION)-raw/ HEAD | \
-		(cd /var/tmp/ && tar xf -) ; \
-	(cd /var/tmp && rm -rf elogind-$(VERSION) && $(MKDIR_P) elogind-$(VERSION) && \
+	$(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) '/^#if 0\s*$$/,/^#endif\s+\/\/\s+0\s*$$/{next}{print}' \
-			elogind-$(VERSION)-raw/$$f \
-		| $(SED) -e '/^\/\/\/ .*elogind.*$$/d' \
-		         -e '/^\/\/ #include.*$$/d' > elogind-$(VERSION)/$$f ; \
+		$(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` ; \
@@ -959,7 +978,7 @@ git-tar:
 	 done ; \
 	 tar czf elogind-$(VERSION).tar.gz elogind-$(VERSION) ; \
 	 rm -rf elogind-$(VERSION) elogind-$(VERSION)-raw) ; \
-	mv /var/tmp/elogind-$(VERSION).tar.gz ./
+	$(AM_V_at)mv /var/tmp/elogind-$(VERSION).tar.gz ./
 
 .PHONY: install-tree
 install-tree: all