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

diff --git a/server/Makefile.in b/server/Makefile.in
index f28a11b140..3c96c4061b 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -1,30 +1,85 @@
 
-CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h
+CLEAN_TARGETS = gen_test_char test_char.h \
+	ApacheCoreOS2.def httpd.exp export_files \
+	exports.c export_vars.h
+
+SUBDIRS = mpm
 
 LTLIBRARY_NAME    = libmain.la
 LTLIBRARY_SOURCES = \
-    uri_delims.h test_char.h \
-	config.c log.c main.c vhost.c util.c util_date.c \
-	util_script.c util_uri.c util_md5.c util_cfgtree.c util_ebcdic.c \
-	rfc1413.c connection.c listen.c \
-        mpm_common.c util_charset.c util_debug.c util_xml.c \
-	util_filter.c exports.c
+    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 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
 
-include $(top_srcdir)/build/ltlib.mk
+TARGETS = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE) export_vars.h httpd.exp
 
-gen_uri_delims_OBJECTS = gen_uri_delims.lo
-gen_uri_delims: $(gen_uri_delims_OBJECTS)
-	$(LINK) $(EXTRA_LDFLAGS) $(gen_uri_delims_OBJECTS) $(EXTRA_LIBS)
+include $(top_builddir)/build/rules.mk
+include $(top_srcdir)/build/library.mk
 
-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)
 
-uri_delims.h: gen_uri_delims
-	./gen_uri_delims > uri_delims.h
-
 test_char.h: gen_test_char
 	./gen_test_char > test_char.h
 
-util_uri.lo: uri_delims.h
 util.lo: test_char.h
+
+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
+# longer here and deadlock.  So, export_files can't be a dependency of
+# delete-exports.
+delete-exports:
+	@if test -f exports.c; then \
+	    if test -f export_files; then \
+	        files=`cat export_files`; \
+	        headers="`find $$files -newer exports.c`"; \
+	        if test -n "$$headers"; then \
+	           echo Found newer headers. Will rebuild exports.c.; \
+	           echo rm -f exports.c export_files; \
+	           rm -f exports.c export_files; \
+	        fi; \
+	    else \
+	        rm -f exports.c; \
+	    fi; \
+	fi
+
+export_files:
+	tmp=export_files_unsorted.txt; \
+	rm -f $$tmp && touch $$tmp; \
+	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
+
+exports.c: export_files
+	$(AWK) -f $(top_srcdir)/build/make_exports.awk `cat $?` > $@
+
+export_vars.h: export_files
+	$(AWK) -f $(top_srcdir)/build/make_var_export.awk `cat $?` > $@
+
+# Rule to make def file for OS/2 core dll
+ApacheCoreOS2.def: exports.c export_vars.h $(top_srcdir)/os/$(OS_DIR)/core_header.def
+	cat $(top_srcdir)/os/$(OS_DIR)/core_header.def > $@
+	$(CPP) $< $(ALL_CPPFLAGS) $(ALL_INCLUDES) | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/  "\1"/' >> $@
+	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.h | grep "^[a-z]" | sed -e 's/^\(.*\)$$/  "\1"/' >> $@
+
+# Rule to make exp file for AIX DSOs
+httpd.exp: exports.c export_vars.h
+	@echo "#! ." > $@
+	@echo "* This file was AUTOGENERATED at build time." >> $@
+	@echo "* Please do not edit by hand." >> $@
+	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | grep -v apr_ | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
+	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.h | grep -v apr_ | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@