Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 39711 invoked from network); 10 Dec 2003 15:59:18 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 10 Dec 2003 15:59:18 -0000 Received: (qmail 2260 invoked by uid 500); 10 Dec 2003 15:59:12 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 2133 invoked by uid 500); 10 Dec 2003 15:59:11 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 2120 invoked by uid 500); 10 Dec 2003 15:59:11 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 2117 invoked from network); 10 Dec 2003 15:59:11 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 10 Dec 2003 15:59:11 -0000 Received: (qmail 39693 invoked by uid 1582); 10 Dec 2003 15:59:16 -0000 Date: 10 Dec 2003 15:59:16 -0000 Message-ID: <20031210155916.39690.qmail@minotaur.apache.org> From: jorton@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/server Makefile.in X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2003/12/10 07:59:16 Modified: server Makefile.in Log: * server/Makefile.in: Revert changes to use an absolute path to exports.c in some (but not all) places, and subsequent fallout. Revision Changes Path 1.87 +2 -9 httpd-2.0/server/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v retrieving revision 1.86 retrieving revision 1.87 diff -u -u -r1.86 -r1.87 --- Makefile.in 6 Apr 2003 19:59:02 -0000 1.86 +++ Makefile.in 10 Dec 2003 15:59:16 -0000 1.87 @@ -13,7 +13,7 @@ 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 $(top_builddir)/server/exports.c buildmark.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 @@ -60,18 +60,11 @@ sort -u $$tmp > $@; \ rm -f $$tmp -# full path required to keep BSD make happy -$(top_builddir)/server/exports.c: export_files +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 $?` > $@ - -# wtf does this have to be explicit???? -exports.lo: exports.c - -# Needed to allow exports.c to be generated in a parallel build successfully -.NOTPARALLEL: $(top_builddir)/server/exports.c # 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