httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1131446 - /httpd/httpd/trunk/server/Makefile.in
Date Sat, 04 Jun 2011 17:41:13 GMT
Author: sf
Date: Sat Jun  4 17:41:13 2011
New Revision: 1131446

URL: http://svn.apache.org/viewvc?rev=1131446&view=rev
Log:
Avoid using a tmpfile with fixed name when creating export_files, since this
is bad for parallel builds.

Modified:
    httpd/httpd/trunk/server/Makefile.in

Modified: httpd/httpd/trunk/server/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/Makefile.in?rev=1131446&r1=1131445&r2=1131446&view=diff
==============================================================================
--- httpd/httpd/trunk/server/Makefile.in (original)
+++ httpd/httpd/trunk/server/Makefile.in Sat Jun  4 17:41:13 2011
@@ -54,16 +54,13 @@ delete-exports:
 	fi
 
 export_files:
-	tmp=export_files_unsorted.txt; \
-	rm -f $$tmp && touch $$tmp; \
-	for dir in $(EXPORT_DIRS); do \
-	    ls $$dir/*.h >> $$tmp; \
-	done; \
-	for dir in $(EXPORT_DIRS_APR); do \
-	    (ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \
-	done; \
-	sort -u $$tmp > $@; \
-	rm -f $$tmp
+	( for dir in $(EXPORT_DIRS); do \
+	      ls $$dir/*.h ; \
+	  done; \
+	  for dir in $(EXPORT_DIRS_APR); do \
+	      ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \
+	  done; \
+	) | sort -u > $@
 
 exports.c: export_files
 	$(AWK) -f $(top_srcdir)/build/make_exports.awk `cat $?` > $@



Mime
View raw message