You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2004/01/12 15:30:14 UTC
cvs commit: httpd-2.0/server Makefile.in
jorton 2004/01/12 06:30:14
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
server Tag: APACHE_2_0_BRANCH Makefile.in
Log:
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
Revision Changes Path
No revision
No revision
1.988.2.213 +2 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.212
retrieving revision 1.988.2.213
diff -b -d -u -r1.988.2.212 -r1.988.2.213
--- CHANGES 12 Jan 2004 02:02:10 -0000 1.988.2.212
+++ CHANGES 12 Jan 2004 14:30:13 -0000 1.988.2.213
@@ -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]
1.751.2.625 +1 -6 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.624
retrieving revision 1.751.2.625
diff -b -d -u -r1.751.2.624 -r1.751.2.625
--- STATUS 12 Jan 2004 14:13:16 -0000 1.751.2.624
+++ STATUS 12 Jan 2004 14:30:13 -0000 1.751.2.625
@@ -112,11 +112,6 @@
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
No revision
No revision
1.75.2.8 +2 -6 httpd-2.0/server/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
retrieving revision 1.75.2.7
retrieving revision 1.75.2.8
diff -b -d -u -r1.75.2.7 -r1.75.2.8
--- Makefile.in 11 Mar 2003 15:41:55 -0000 1.75.2.7
+++ Makefile.in 12 Jan 2004 14:30:14 -0000 1.75.2.8
@@ -13,7 +13,7 @@
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,15 +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
# 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