From: Joe Orton <jorton@apache.org>
Date: Mon, 19 Jan 2004 20:54:48 +0000 (+0000)
Subject: * server/Makefile.in: Simpler fix to ensure that buildmark.lo is
X-Git-Tag: pre_ajp_proxy~783
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8787f61c2b912d17dd00e1b0259ef2579012edcf;p=apache

* server/Makefile.in: Simpler fix to ensure that buildmark.lo is
always regenerated: remove buildmark.lo in delete-exports.


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

diff --git a/server/Makefile.in b/server/Makefile.in
index bd5799edad..c16a283532 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -13,19 +13,14 @@ 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 buildmarked.c \
+	util_filter.c exports.c buildmark.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)
@@ -42,6 +37,7 @@ EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(APR_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`; \