summaryrefslogtreecommitdiffstats
path: root/server/Makefile.in
diff options
context:
space:
mode:
authorJoe Orton <jorton@apache.org>2004-01-19 21:54:48 +0100
committerJoe Orton <jorton@apache.org>2004-01-19 21:54:48 +0100
commit8787f61c2b912d17dd00e1b0259ef2579012edcf (patch)
tree47868ba560e6db21df01ce13ace63053c51bba0a /server/Makefile.in
parent* build/special.mk (install-modules): Remove redundant semi-colon. (diff)
downloadapache2-8787f61c2b912d17dd00e1b0259ef2579012edcf.tar.xz
apache2-8787f61c2b912d17dd00e1b0259ef2579012edcf.zip
* 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
Diffstat (limited to 'server/Makefile.in')
-rw-r--r--server/Makefile.in8
1 files changed, 2 insertions, 6 deletions
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`; \