From: Joe Orton <jorton@apache.org>
Date: Fri, 9 Jan 2004 12:19:55 +0000 (+0000)
Subject: Fix regeneration of build datestamp on every make invocation (a
X-Git-Tag: pre_ajp_proxy~843
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=59ddeafec60f6536c3ba56c47faa264b2285d70a;p=apache

Fix regeneration of build datestamp on every make invocation (a
regression since 1.3).

* Makefile.in: Remove redundant PHONY_TARGETS setting.

* server/Makefile.in: Mark buildmark.c as phony; build it indirectly
via buildmarked.c since implicit rules are ignored for phony targets.


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

diff --git a/Makefile.in b/Makefile.in
index bfc97a82a6..52a144fc86 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,6 @@ PROGRAM_DEPENDENCIES = \
 
 PROGRAMS        = $(PROGRAM_NAME)
 TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
-PHONY_TARGETS   = $(srcdir)/buildmark.c
 INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
 	install-other install-cgi install-include install-suexec install-man \
 	install-build
diff --git a/server/.cvsignore b/server/.cvsignore
index e406311138..43f85eb239 100644
--- a/server/.cvsignore
+++ b/server/.cvsignore
@@ -20,3 +20,4 @@ BuildLog.htm
 *.stt
 *.sto
 *.vcproj
+buildmarked.c
diff --git a/server/Makefile.in b/server/Makefile.in
index 698dda6af1..bd5799edad 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -1,6 +1,6 @@
 
 CLEAN_TARGETS = gen_test_char test_char.h gen_uri_delims uri_delims.h \
-	ApacheCoreOS2.def
+	ApacheCoreOS2.def buildmarked.c
 DISTCLEAN_TARGETS = httpd.exp
 EXTRACLEAN_TARGETS = export_files exports.c export_vars.h
 
@@ -13,14 +13,19 @@ 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 buildmarked.c \
 	scoreboard.c error_bucket.c protocol.c core.c request.c provider.c
 
 TARGETS = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE) export_vars.h httpd.exp
 
+PHONY_TARGETS = $(srcdir)/buildmark.c
+
 include $(top_builddir)/build/rules.mk
 include $(top_srcdir)/build/library.mk
 
+buildmarked.c: $(srcdir)/buildmark.c
+	cp $(srcdir)/buildmark.c $@
+
 gen_test_char_OBJECTS = gen_test_char.lo util_debug.lo
 gen_test_char: $(gen_test_char_OBJECTS)
 	$(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)