Commit 26337a1a authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

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!


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

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ Changes with Apache 2.1.3 








  [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>]


































Makefile.in



+2
−1



























Changes for Makefile.in: 2 added lines, 1 removed line.



Original line number
Diff line number
Diff line







@@ -4,7 +4,8 @@ CLEAN_SUBDIRS = test

















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) \


































build/program.mk



+1
−0



























Changes for build/program.mk: 1 added line, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -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)
























server/Makefile.in



+1
−2



























Changes for server/Makefile.in: 1 added line, 2 removed lines.



Original line number
Diff line number
Diff line







@@ -12,7 +12,7 @@ LTLIBRARY_SOURCES = \







	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 @@ EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR)







# 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`; \