Fix build with parallel make:

* server/Makefile.in: Revert changes to use an absolute path to
exports.c in some (but not all) places, and subsequent fallout.

PR: 24643
Reviewed by: Andr�� Malo, Jeff Trawick

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

diff --git a/CHANGES b/CHANGES
index 0e22c85b9f57860ab67d465dce175989002d3265..ee3999dfad31687fd1f5b27fbc28536f68d29071 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 Changes with Apache 2.0.49
 
+  *) Fix build with parallel make.  PR 24643.  [Joe Orton]
+
   *) mod_rewrite: In external rewrite maps lookup keys containing
      a newline now cause a lookup failure. PR 14453.
      [Cedric Gavage <cedric.gavage unixtech.be>, André Malo]

diff --git a/STATUS b/STATUS
index 61fbb931be8cfa0a4c8215553976045df55210e7..9e5eac9d8465be3bb988c4cf978a9727a6fa5f2d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/01/12 14:13:16 $]
+Last modified at [$Date: 2004/01/12 14:30:13 $]
 
 Release:
 
@@ -112,11 +112,6 @@ PATCHES TO BACKPORT FROM 2.1
       PR: 23956
       +1: jorton, nd, trawick
 
-    * Fix parallel make (e.g. GNU make -j<N>).
-      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/Makefile.in?r1=1.86&r2=1.87
-      PR: 24643
-      +1: jorton, nd, trawick
-
     * mod_dav: Reject requests including fragment part in the Request-URI.
       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/dav/main/mod_dav.c?r1=1.102&r2=1.103
       PR: 21779

diff --git a/server/Makefile.in b/server/Makefile.in
index 43f280cd62529814709d5a8c23a989e44dcabff7..a20b4206cb8bfb6bffacddedb612d6c28c0f705c 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -13,7 +13,7 @@ LTLIBRARY_SOURCES = \
        util_script.c util_md5.c util_cfgtree.c util_ebcdic.c util_time.c \
        rfc1413.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,16 +60,12 @@ export_files:
        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
-
 # 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 > $@