httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@locus.apache.org
Subject cvs commit: httpd-2.0/server Makefile.in
Date Wed, 20 Dec 2000 10:19:07 GMT
gstein      00/12/20 02:19:06

  Modified:    server   Makefile.in
  Log:
  exports.c was dependent upon delete-exports, but that dependency will always
  fail since there is no delete-exports file (thus, exports.c would always get
  regenerated, recompiled, and relinked). Instead, we move the delete-exports
  target "up" to the "all" target. However, ltlib.mk doesn't allow us to add
  things to the "all" target, so we also revise the set of .mk files to use.
  
  also use TARGET_EXPORTS consistently.
  
  Revision  Changes    Path
  1.29      +11 -6     httpd-2.0/server/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -u -r1.28 -r1.29
  --- Makefile.in	2000/12/19 17:52:40	1.28
  +++ Makefile.in	2000/12/20 10:19:06	1.29
  @@ -1,9 +1,10 @@
   
  -CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h apache.exports
  +TARGET_EXPORTS    = apache.exports
  +CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h \
  +	$(TARGET_EXPORTS)
   
   SUBDIRS = mpm
   
  -TARGET_EXPORTS    = apache.exports
   LTLIBRARY_NAME    = libmain.la
   LTLIBRARY_SOURCES = \
       uri_delims.h test_char.h \
  @@ -12,8 +13,11 @@
   	rfc1413.c connection.c listen.c \
           mpm_common.c util_charset.c util_debug.c util_xml.c \
   	util_filter.c exports.c buildmark.c
  +
  +targets = delete-exports $(LTLIBRARY_NAME)
   
  -include $(top_srcdir)/build/ltlib.mk
  +include $(top_srcdir)/build/rules.mk
  +include $(top_srcdir)/build/library.mk
   
   gen_uri_delims_OBJECTS = gen_uri_delims.lo
   gen_uri_delims: $(gen_uri_delims_OBJECTS)
  @@ -32,7 +36,8 @@
   util_uri.lo: uri_delims.h
   util.lo: test_char.h
   
  -EXPORT_FILES = ../srclib/apr/apr.exports ../srclib/apr-util/aprutil.exports apache.exports
  +EXPORT_FILES = ../srclib/apr/apr.exports ../srclib/apr-util/aprutil.exports \
  +	$(TARGET_EXPORTS)
   
   delete-exports:
   	@if test -f $(TARGET_EXPORTS); then \
  @@ -46,7 +51,7 @@
   
   
   $(TARGET_EXPORTS):
  -	$(AWK) -f $(top_srcdir)/srclib/apr/helpers/make_export.awk $(top_srcdir)/include/*.h >
$@ ; \
  +	$(AWK) -f $(top_srcdir)/srclib/apr/helpers/make_export.awk $(top_srcdir)/include/*.h >
$@
   
  -exports.c: delete-exports $(EXPORT_FILES)
  +exports.c: $(EXPORT_FILES)
   	(cat $(EXPORT_FILES) | ../build/buildexports.sh ..) > $@
  
  
  

Mime
View raw message