httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject svn commit: r153266 - in httpd/httpd/trunk: CHANGES Makefile.in build/program.mk server/Makefile.in
Date Thu, 10 Feb 2005 15:32:07 GMT
Author: jerenkrantz
Date: Thu Feb 10 07:32:05 2005
New Revision: 153266

URL: http://svn.apache.org/viewcvs?view=rev&rev=153266
Log:
Only recompile buildmark.c when we have to relink httpd.

This allows us to be able to do a make on an up-to-date tree without forcing
a recompile and relink.  Yay!

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/Makefile.in
    httpd/httpd/trunk/build/program.mk
    httpd/httpd/trunk/server/Makefile.in

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?view=diff&r1=153265&r2=153266
==============================================================================
--- httpd/httpd/trunk/CHANGES (original)
+++ httpd/httpd/trunk/CHANGES Thu Feb 10 07:32:05 2005
@@ -2,6 +2,9 @@
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Only recompile buildmark.c when we have to relink httpd.
+     [Justin Erenkrantz]
+
   *) Remove formatting characters from ap_log_error() calls.  These
      were escaped as fallout from CAN-2003-0020.
      [Eric Covener <ecovener gmail.com>]

Modified: httpd/httpd/trunk/Makefile.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/Makefile.in?view=diff&r1=153265&r2=153266
==============================================================================
--- httpd/httpd/trunk/Makefile.in (original)
+++ httpd/httpd/trunk/Makefile.in Thu Feb 10 07:32:05 2005
@@ -4,7 +4,8 @@
 
 PROGRAM_NAME         = $(progname)
 PROGRAM_SOURCES      = modules.c
-PROGRAM_LDADD        = $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
$(LIBS)
+PROGRAM_LDADD        = buildmark.lo $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
$(AP_LIBS) $(LIBS)
+PROGRAM_PRELINK      = $(COMPILE) -c $(top_srcdir)/server/buildmark.c
 PROGRAM_DEPENDENCIES = \
   server/libmain.la \
   $(BUILTIN_LIBS) \

Modified: httpd/httpd/trunk/build/program.mk
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/build/program.mk?view=diff&r1=153265&r2=153266
==============================================================================
--- httpd/httpd/trunk/build/program.mk (original)
+++ httpd/httpd/trunk/build/program.mk Thu Feb 10 07:32:05 2005
@@ -18,4 +18,5 @@
 PROGRAM_OBJECTS = $(PROGRAM_SOURCES:.c=.lo)
 
 $(PROGRAM_NAME): $(PROGRAM_DEPENDENCIES) $(PROGRAM_OBJECTS)
+	$(PROGRAM_PRELINK)
 	$(LINK) $(PROGRAM_LDFLAGS) $(PROGRAM_OBJECTS) $(PROGRAM_LDADD)

Modified: httpd/httpd/trunk/server/Makefile.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/Makefile.in?view=diff&r1=153265&r2=153266
==============================================================================
--- httpd/httpd/trunk/server/Makefile.in (original)
+++ httpd/httpd/trunk/server/Makefile.in Thu Feb 10 07:32:05 2005
@@ -12,7 +12,7 @@
 	util_script.c util_md5.c util_cfgtree.c util_ebcdic.c util_time.c \
 	connection.c listen.c \
 	mpm_common.c util_charset.c util_debug.c util_xml.c \
-	util_filter.c exports.c buildmark.c \
+	util_filter.c exports.c \
 	scoreboard.c error_bucket.c protocol.c core.c request.c provider.c \
 	eoc_bucket.c core_filters.c
 
@@ -38,7 +38,6 @@
 # longer here and deadlock.  So, export_files can't be a dependency of
 # delete-exports.
 delete-exports:
-	rm -f buildmark.lo
 	@if test -f exports.c; then \
 	    if test -f export_files; then \
 	        files=`cat export_files`; \



Mime
View raw message