You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2003/02/17 02:00:50 UTC
cvs commit: httpd-2.0/server Makefile.in
jerenkrantz 2003/02/16 17:00:50
Modified: server Makefile.in
Log:
Rework the delete-exports target once more. Leave a comment there explaining
why we have to be complicated. (Why make's dependency code doesn't catch this,
I don't know.)
Revision Changes Path
1.85 +15 -7 httpd-2.0/server/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -u -r1.84 -r1.85
--- Makefile.in 28 Jan 2003 18:51:57 -0000 1.84
+++ Makefile.in 17 Feb 2003 01:00:50 -0000 1.85
@@ -32,14 +32,22 @@
EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) $(top_srcdir)/modules/http
-delete-exports: export_files
+# If export_files is a dependency here, but we remove it during this stage,
+# when exports.c is generated, make will not detect that export_files is no
+# longer here and deadlock. So, export_files can't be a dependency of
+# delete-exports.
+delete-exports:
@if test -f exports.c; then \
- files=`cat $?`; \
- headers="`find $$files -newer exports.c`"; \
- if test -n "$$headers"; then \
- echo Found newer headers. Will rebuild exports.c.; \
- echo rm -f exports.c export_files; \
- rm -f exports.c export_files; \
+ if test -f export_files; then \
+ files=`cat export_files`; \
+ headers="`find $$files -newer exports.c`"; \
+ if test -n "$$headers"; then \
+ echo Found newer headers. Will rebuild exports.c.; \
+ echo rm -f exports.c export_files; \
+ rm -f exports.c export_files; \
+ fi; \
+ else \
+ rm -f exports.c; \
fi; \
fi