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

diff --git a/CHANGES b/CHANGES
index 3946324eb8a7862b5f994d6615c5026702ea3290..a9ab3c6632531484658bcc697181d4e594ec9590 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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>]

diff --git a/Makefile.in b/Makefile.in
index 738f51e3360e02ddff79162d5443de480212311f..514947e2935ae82100ac36227c18f500434f35c2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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) \

diff --git a/build/program.mk b/build/program.mk
index 19312c88d8161f171aefdb892f1e2098785ab3c2..3b5d2abef2c84dc67eff5678810c7f53f18101ce 100644 (file)
--- a/build/program.mk
+++ b/build/program.mk
@@ -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)

diff --git a/server/Makefile.in b/server/Makefile.in
index 97b602f7d9a1d267763d619ff0aaa987aae8c1c2..c005b4fa729e34682cae7d4efe8bab8996c2c13f 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -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`; \