You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2004/01/09 13:19:56 UTC
cvs commit: httpd-2.0/server .cvsignore Makefile.in
jorton 2004/01/09 04:19:56
Modified: . Makefile.in
server .cvsignore Makefile.in
Log:
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.
Revision Changes Path
1.137 +0 -1 httpd-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.in,v
retrieving revision 1.136
retrieving revision 1.137
diff -b -d -u -r1.136 -r1.137
--- Makefile.in 29 Jul 2003 13:40:09 -0000 1.136
+++ Makefile.in 9 Jan 2004 12:19:55 -0000 1.137
@@ -13,7 +13,6 @@
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
1.17 +1 -0 httpd-2.0/server/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/httpd-2.0/server/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -b -d -u -r1.16 -r1.17
--- .cvsignore 29 Nov 2002 07:21:07 -0000 1.16
+++ .cvsignore 9 Jan 2004 12:19:55 -0000 1.17
@@ -20,3 +20,4 @@
*.stt
*.sto
*.vcproj
+buildmarked.c
1.88 +7 -2 httpd-2.0/server/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
retrieving revision 1.87
retrieving revision 1.88
diff -b -d -u -r1.87 -r1.88
--- Makefile.in 10 Dec 2003 15:59:16 -0000 1.87
+++ Makefile.in 9 Jan 2004 12:19:55 -0000 1.88
@@ -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,13 +13,18 @@
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)