You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by je...@apache.org on 2002/04/22 03:24:51 UTC
cvs commit: apr/user/unix Makefile.in
jerenkrantz 02/04/21 18:24:51
Modified: . CHANGES Makefile.in configure.in
atomic/os390 Makefile.in
atomic/solaris_sparc Makefile.in
atomic/unix Makefile.in
build Makefile.in rules.mk.in
dso/aix Makefile.in
dso/beos Makefile.in
dso/os2 Makefile.in
dso/os390 Makefile.in
dso/unix Makefile.in
file_io/os2 Makefile.in
file_io/unix Makefile.in
i18n/unix Makefile.in
locks/beos Makefile.in
locks/os2 Makefile.in
locks/unix Makefile.in
memory/unix Makefile.in
misc/unix Makefile.in
mmap/unix Makefile.in
network_io/beos Makefile.in
network_io/os2 Makefile.in
network_io/unix Makefile.in
passwd Makefile.in
shmem/beos Makefile.in
shmem/os2 Makefile.in
shmem/unix Makefile.in
strings Makefile.in
tables Makefile.in
test Makefile.in
threadproc/beos Makefile.in
threadproc/os2 Makefile.in
threadproc/unix Makefile.in
time/unix Makefile.in
user/unix Makefile.in
Log:
Allow VPATH builds to properly generate build dependencies. This requires
srcdir to always be available in a Makefile, so we need to stop adding
this only when we use VPATH.
Change the dependency generation to use .deps instead of appending to
the Makefile. This makes us consistent with the dependency style of
httpd-2.0.
Revision Changes Path
1.262 +3 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- CHANGES 19 Apr 2002 17:21:05 -0000 1.261
+++ CHANGES 22 Apr 2002 01:24:48 -0000 1.262
@@ -1,5 +1,8 @@
Changes with APR b1
+ *) Allow VPATH builds to properly build dependencies and switch to
+ a .deps dependency model to mimic httpd-2.0. [Justin Erenkrantz]
+
*) Tru64: Stop leaving zombies in APR apps like mod_cgid which
tell APR to ignore SIGCHLD.
[Dave Hill <Da...@Compaq.com>]
1.74 +1 -0 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- Makefile.in 15 Apr 2002 22:01:39 -0000 1.73
+++ Makefile.in 22 Apr 2002 01:24:48 -0000 1.74
@@ -42,6 +42,7 @@
includedir=@includedir@
installbuilddir=@installbuilddir@
srcdir=@srcdir@
+VPATH=@srcdir@
top_srcdir=@top_srcdir@
top_blddir=@top_builddir@
1.433 +1 -7 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -r1.432 -r1.433
--- configure.in 20 Apr 2002 08:28:49 -0000 1.432
+++ configure.in 22 Apr 2002 01:24:48 -0000 1.433
@@ -1717,13 +1717,7 @@
if test -n "$USE_VPATH"; then
for makefile in $MAKEFILE1 $MAKEFILE2 $MAKEFILE3; do
- dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`
- (cat <<EOF
-srcdir = $apr_srcdir/$dir
-VPATH = $apr_srcdir/$dir
-
-EOF
-) | cat - $makefile | \
+ cat $makefile | \
sed \
-e 's#-I\($(INCDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' \
-e 's#-I\($(OSDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' \
1.2 +2 -0 apr/atomic/os390/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/atomic/os390/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 22 Mar 2002 19:01:03 -0000 1.1
+++ Makefile.in 22 Apr 2002 01:24:48 -0000 1.2
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = atomic.lo
1.8 +2 -1 apr/atomic/solaris_sparc/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/atomic/solaris_sparc/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in 29 Mar 2002 18:20:57 -0000 1.7
+++ Makefile.in 22 Apr 2002 01:24:48 -0000 1.8
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = @apr_atomic_sparc_compile@
@@ -8,7 +10,6 @@
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
-srcdir=@srcdir@
apr_atomic_sparc.lo: $(srcdir)/apr_atomic_sparc.s
$(ASCPP) $(ASCPPFLAGS) $(srcdir)/$*.s > $*.S
1.2 +2 -0 apr/atomic/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/atomic/unix/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 12 Feb 2002 21:51:30 -0000 1.1
+++ Makefile.in 22 Apr 2002 01:24:48 -0000 1.2
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = apr_atomic.lo
1.4 +3 -0 apr/build/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/build/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 17 May 2001 22:25:56 -0000 1.3
+++ Makefile.in 22 Apr 2002 01:24:49 -0000 1.4
@@ -1,3 +1,6 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
TARGETS=
INCLUDES=
DISTCLEAN_TARGETS = rules.mk
1.24 +3 -4 apr/build/rules.mk.in
Index: rules.mk.in
===================================================================
RCS file: /home/cvs/apr/build/rules.mk.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rules.mk.in 13 Mar 2002 20:39:08 -0000 1.23
+++ rules.mk.in 22 Apr 2002 01:24:49 -0000 1.24
@@ -195,10 +195,9 @@
local-all: $(TARGETS)
local-depend: x-local-depend
- @if test -n "`ls *.c 2> /dev/null`"; then \
- echo $(MKDEP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) *.c ; \
- CC=${CC} $(MKDEP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) *.c ; \
- fi
+ @if test -n "`ls $(srcdir)/*.c 2> /dev/null`"; then \
+ $(CC) -MM $(ALL_CPPFLAGS) $(ALL_INCLUDES) $(srcdir)/*.c | sed 's/\.o:/.lo:/' > .deps || true; \
+ fi
# to be filled in by the actual Makefile
x-local-depend x-local-clean x-local-distclean x-local-extraclean:
1.9 +2 -0 apr/dso/aix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/dso/aix/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 2 Apr 2001 19:33:05 -0000 1.8
+++ Makefile.in 22 Apr 2002 01:24:49 -0000 1.9
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = dso.lo
1.10 +2 -0 apr/dso/beos/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/dso/beos/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 9 Jan 2001 11:05:38 -0000 1.9
+++ Makefile.in 22 Apr 2002 01:24:49 -0000 1.10
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = dso.lo
1.11 +2 -0 apr/dso/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/dso/os2/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 9 Jan 2001 11:05:40 -0000 1.10
+++ Makefile.in 22 Apr 2002 01:24:49 -0000 1.11
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = dso.lo
1.6 +2 -0 apr/dso/os390/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/dso/os390/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 12 Feb 2001 20:45:58 -0000 1.5
+++ Makefile.in 22 Apr 2002 01:24:49 -0000 1.6
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = dso.lo
1.16 +2 -0 apr/dso/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/dso/unix/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.in 9 Jan 2001 11:05:44 -0000 1.15
+++ Makefile.in 22 Apr 2002 01:24:49 -0000 1.16
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = dso.lo
1.24 +2 -0 apr/file_io/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/file_io/os2/Makefile.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.in 2 Feb 2002 06:12:34 -0000 1.23
+++ Makefile.in 22 Apr 2002 01:24:49 -0000 1.24
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = \
dir.lo \
1.25 +2 -0 apr/file_io/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/file_io/unix/Makefile.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.in 1 Feb 2002 01:40:38 -0000 1.24
+++ Makefile.in 22 Apr 2002 01:24:49 -0000 1.25
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = \
copy.lo \
1.12 +2 -0 apr/i18n/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/i18n/unix/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 9 Jan 2001 11:05:51 -0000 1.11
+++ Makefile.in 22 Apr 2002 01:24:49 -0000 1.12
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = xlate.lo
1.20 +2 -0 apr/locks/beos/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/locks/beos/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.in 13 Apr 2002 13:52:25 -0000 1.19
+++ Makefile.in 22 Apr 2002 01:24:49 -0000 1.20
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = \
thread_mutex.lo \
1.20 +2 -0 apr/locks/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/locks/os2/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.in 9 Apr 2002 07:05:29 -0000 1.19
+++ Makefile.in 22 Apr 2002 01:24:50 -0000 1.20
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = \
thread_mutex.lo \
1.25 +2 -0 apr/locks/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/locks/unix/Makefile.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.in 9 Apr 2002 06:56:56 -0000 1.24
+++ Makefile.in 22 Apr 2002 01:24:50 -0000 1.25
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = \
thread_mutex.lo \
1.9 +2 -0 apr/memory/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/memory/unix/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 28 Sep 2001 14:05:23 -0000 1.8
+++ Makefile.in 22 Apr 2002 01:24:50 -0000 1.9
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = apr_pools.lo
1.30 +2 -0 apr/misc/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/misc/unix/Makefile.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile.in 11 Nov 2001 07:23:57 -0000 1.29
+++ Makefile.in 22 Apr 2002 01:24:50 -0000 1.30
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = \
start.lo getopt.lo otherchild.lo errorcodes.lo rand.lo \
1.19 +2 -0 apr/mmap/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/mmap/unix/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in 9 Jan 2001 11:06:03 -0000 1.18
+++ Makefile.in 22 Apr 2002 01:24:50 -0000 1.19
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = mmap.lo common.lo
1.16 +2 -0 apr/network_io/beos/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/network_io/beos/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.in 9 Jan 2001 11:06:05 -0000 1.15
+++ Makefile.in 22 Apr 2002 01:24:50 -0000 1.16
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = poll.lo sendrecv.lo socketcommon.lo
1.17 +2 -0 apr/network_io/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/network_io/os2/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.in 19 Mar 2001 12:35:14 -0000 1.16
+++ Makefile.in 22 Apr 2002 01:24:50 -0000 1.17
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = \
poll.lo \
1.23 +2 -0 apr/network_io/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/network_io/unix/Makefile.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.in 9 Jan 2001 11:06:09 -0000 1.22
+++ Makefile.in 22 Apr 2002 01:24:50 -0000 1.23
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = \
poll.lo \
1.6 +2 -0 apr/passwd/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/passwd/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 9 Jan 2001 11:06:12 -0000 1.5
+++ Makefile.in 22 Apr 2002 01:24:50 -0000 1.6
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = apr_md5.lo apr_getpass.lo
1.3 +2 -0 apr/shmem/beos/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/shmem/beos/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 11 Jan 2002 12:16:40 -0000 1.2
+++ Makefile.in 22 Apr 2002 01:24:50 -0000 1.3
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = shm.lo
1.9 +2 -0 apr/shmem/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/shmem/os2/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 10 Jan 2002 02:09:20 -0000 1.8
+++ Makefile.in 22 Apr 2002 01:24:50 -0000 1.9
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = shm.lo
1.19 +2 -0 apr/shmem/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/shmem/unix/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in 10 Jan 2002 00:20:06 -0000 1.18
+++ Makefile.in 22 Apr 2002 01:24:50 -0000 1.19
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = shm.lo
1.10 +2 -0 apr/strings/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/strings/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 23 May 2001 14:15:43 -0000 1.9
+++ Makefile.in 22 Apr 2002 01:24:50 -0000 1.10
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = \
apr_cpystrn.lo \
1.7 +2 -0 apr/tables/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/tables/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 9 Jan 2001 11:06:18 -0000 1.6
+++ Makefile.in 22 Apr 2002 01:24:50 -0000 1.7
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = apr_tables.lo apr_hash.lo
1.81 +2 -0 apr/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/test/Makefile.in,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- Makefile.in 21 Feb 2002 17:10:55 -0000 1.80
+++ Makefile.in 22 Apr 2002 01:24:50 -0000 1.81
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
PROGRAMS = \
client@EXEEXT@ \
1.20 +2 -0 apr/threadproc/beos/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/threadproc/beos/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.in 9 Jan 2001 11:06:21 -0000 1.19
+++ Makefile.in 22 Apr 2002 01:24:51 -0000 1.20
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = \
proc.lo \
1.14 +2 -0 apr/threadproc/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/threadproc/os2/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.in 9 Jan 2001 11:06:23 -0000 1.13
+++ Makefile.in 22 Apr 2002 01:24:51 -0000 1.14
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = \
proc.lo \
1.29 +2 -0 apr/threadproc/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/threadproc/unix/Makefile.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile.in 9 Jan 2001 11:06:25 -0000 1.28
+++ Makefile.in 22 Apr 2002 01:24:51 -0000 1.29
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = \
proc.lo \
1.22 +2 -0 apr/time/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/time/unix/Makefile.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.in 9 Jan 2001 11:06:26 -0000 1.21
+++ Makefile.in 22 Apr 2002 01:24:51 -0000 1.22
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = time.lo timestr.lo
1.7 +2 -0 apr/user/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/user/unix/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 28 Jan 2001 01:18:04 -0000 1.6
+++ Makefile.in 22 Apr 2002 01:24:51 -0000 1.7
@@ -1,3 +1,5 @@
+srcdir = @srcdir@
+VPATH = @srcdir@
TARGETS = userinfo.lo groupinfo.lo