X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=server%2FMakefile.in;h=3c96c4061bee3433f3b784102d45218b272d92be;hb=7d5bef8273f482dee4d3b82c101f07db78c2f7bb;hp=bd5799edada81d259f735097f0f08075b3bf0b09;hpb=59ddeafec60f6536c3ba56c47faa264b2285d70a;p=apache

diff --git a/server/Makefile.in b/server/Makefile.in
index bd5799edad..3c96c4061b 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -1,8 +1,7 @@
 
-CLEAN_TARGETS = gen_test_char test_char.h gen_uri_delims uri_delims.h \
-	ApacheCoreOS2.def buildmarked.c
-DISTCLEAN_TARGETS = httpd.exp
-EXTRACLEAN_TARGETS = export_files exports.c export_vars.h
+CLEAN_TARGETS = gen_test_char test_char.h \
+	ApacheCoreOS2.def httpd.exp export_files \
+	exports.c export_vars.h
 
 SUBDIRS = mpm
 
@@ -11,22 +10,18 @@ LTLIBRARY_SOURCES = \
     test_char.h \
 	config.c log.c main.c vhost.c util.c \
 	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 \
-	scoreboard.c error_bucket.c protocol.c core.c request.c provider.c
+	connection.c listen.c util_mutex.c \
+	mpm_common.c util_charset.c util_cookies.c util_debug.c util_xml.c \
+	util_expr.c util_filter.c util_pcre.c exports.c \
+	scoreboard.c error_bucket.c protocol.c core.c request.c provider.c \
+	eoc_bucket.c eor_bucket.c core_filters.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_OBJECTS = gen_test_char.lo
 gen_test_char: $(gen_test_char_OBJECTS)
 	$(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
 
@@ -35,7 +30,8 @@ test_char.h: gen_test_char
 
 util.lo: test_char.h
 
-EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) $(top_srcdir)/modules/http
+EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(top_srcdir)/modules/http
+EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR)
 
 # If export_files is a dependency here, but we remove it during this stage,
 # when exports.c is generated, make will not detect that export_files is no
@@ -62,6 +58,9 @@ export_files:
 	for dir in $(EXPORT_DIRS); do \
 	    ls $$dir/*.h >> $$tmp; \
 	done; \
+	for dir in $(EXPORT_DIRS_APR); do \
+	    (ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \
+	done; \
 	sort -u $$tmp > $@; \
 	rm -f $$tmp