Tweak server/Makefile so that the rules for generating exports.c

are compatible with make utilities which don't expand wildcards
in a dependency list (e.g., OS/390 make, certain levels of GNU
make).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90167 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 4aacd9d2fb757253c7eaf4e98b95a52e41e4ff8b..04822bf35bc1af28bb2e592c1bb0da24f1d73361 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.24-dev
 
+  *) Tweak server/Makefile so that the rules for generating exports.c
+     are compatible with make utilities which don't expand wildcards
+     in a dependency list (e.g., OS/390 make, certain levels of GNU
+     make).  [Jeff Trawick]
+
   *) Install the SSL headers.  [John Sterling <sterling@covalent.net>]
 
   *) Begin to sanitize the MPM configuration directives.  Now, all

diff --git a/server/Makefile.in b/server/Makefile.in
index 7e40964f1cf3fab8bee39d2493565b56e8055018..3a01deec4c4975af41502535f63dd658eed3b0dc 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -17,7 +17,7 @@ LTLIBRARY_SOURCES = \
         util_filter.c exports.c buildmark.c scoreboard.c \
        error_bucket.c protocol.c core.c request.c
 
-TARGETS = $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE) export_vars.h httpd.exp
+TARGETS = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE) export_vars.h httpd.exp
 
 include $(top_srcdir)/build/rules.mk
 include $(top_srcdir)/build/library.mk
@@ -36,7 +36,17 @@ EXPORT_FILES = $(top_srcdir)/include/*.h \
        $(top_srcdir)/srclib/apr/include/*.h \
        $(top_srcdir)/srclib/apr-util/include/*.h
 
-exports.c: $(EXPORT_FILES)
+delete-exports:
+       @if test -f exports.c; then \
+                   headers="`find $(top_srcdir)/include/*.h -newer exports.c`" ; \
+                   if test -n "$$headers"; then \
+                       echo Found newer headers. Will rebuild exports.c. ; \
+                       echo rm -f exports.c ; \
+                       rm -f exports.c ; \
+                   fi \
+       fi
+
+exports.c:
        $(AWK) -f $(top_srcdir)/build/make_exports.awk $(EXPORT_FILES) > $@
 
 export_vars.h: