You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2001/08/15 16:06:27 UTC

cvs commit: httpd-2.0/server Makefile.in

trawick     01/08/15 07:06:27

  Modified:    .        CHANGES
               server   Makefile.in
  Log:
  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).
  
  Revision  Changes    Path
  1.292     +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.291
  retrieving revision 1.292
  diff -u -r1.291 -r1.292
  --- CHANGES	2001/08/13 23:06:06	1.291
  +++ CHANGES	2001/08/15 14:06:26	1.292
  @@ -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 <st...@covalent.net>]
   
     *) Begin to sanitize the MPM configuration directives.  Now, all
  
  
  
  1.64      +12 -2     httpd-2.0/server/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- Makefile.in	2001/07/25 02:14:39	1.63
  +++ Makefile.in	2001/08/15 14:06:27	1.64
  @@ -17,7 +17,7 @@
           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 @@
          $(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: