You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by sa...@locus.apache.org on 2000/12/15 17:57:02 UTC
cvs commit: apr/locks/unix Makefile.in locks.c
sascha 00/12/15 08:57:01
Modified: . Makefile.in aclocal.m4 configure.in
dso/unix Makefile.in dso.c
locks/unix Makefile.in locks.c
Log:
Fix VPATH support. APR builds now cleanly in a separate build directory.
Submitted by: Mo DeJong <md...@cygnus.com>
Revision Changes Path
1.34 +10 -2 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -u -r1.33 -r1.34
--- Makefile.in 2000/12/12 15:12:10 1.33
+++ Makefile.in 2000/12/15 16:56:50 1.34
@@ -116,10 +116,18 @@
fi
$(TARGET_EXPORTS):
- perl ./helpers/make_export.pl -o $@ include/*.h
+ if test -z "$(srcdir)"; then \
+ perl $(srcdir)helpers/make_export.pl -o $@ include/*.h; \
+ else \
+ perl $(srcdir)helpers/make_export.pl -o $@ include/*.h $(srcdir)include/*.h; \
+ fi
docs:
- ./helpers/scandoc -i./helpers/default.pl -p./docs/ ./include/*.h
+ if test -z "$(srcdir)"; then \
+ $(srcdir)helpers/scandoc -i$(srcdir)helpers/default.pl -p./docs/ ./include/*.h; \
+ else \
+ $(srcdir)helpers/scandoc -i$(srcdir)helpers/default.pl -p./docs/ ./include/*.h $(srcdir)include/*.h; \
+ fi
test: $(LIBAPR)
(cd test; make clean; make; \
1.35 +1 -1 apr/aclocal.m4
Index: aclocal.m4
===================================================================
RCS file: /home/cvs/apr/aclocal.m4,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -u -r1.34 -r1.35
--- aclocal.m4 2000/12/06 13:08:27 1.34
+++ aclocal.m4 2000/12/15 16:56:51 1.35
@@ -328,7 +328,7 @@
AC_DEFUN(APR_PREPARE_MM_DIR,[
dnl #----------------------------- Prepare mm directory for VPATH support
if test -n "$USE_MM" && test -n "$USE_VPATH"; then
- test -d $mm_dir || $MKDIR -p $mm_dir
+ test -d $mm_dir || $MKDIR $mm_dir
for i in shtool config.guess config.sub fbtool ltconfig \
ltmain.sh mm_vers.c; do
1.189 +9 -2 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -u -r1.188 -r1.189
--- configure.in 2000/12/13 22:30:19 1.188
+++ configure.in 2000/12/15 16:56:51 1.189
@@ -801,7 +801,7 @@
SUBDIRS="lib strings passwd tables "
for dir in $MODULES
do
- test -d $dir || $MKDIR -p $dir
+ test -d $dir || $MKDIR $dir
if test -f $srcdir/$dir/$OSDIR/Makefile.in; then
MAKEFILE2="$MAKEFILE2 $dir/$OSDIR/Makefile "
SUBDIRS="$SUBDIRS $dir/$OSDIR "
@@ -825,6 +825,9 @@
test -r $i && mv $i $i.save
done
+dir=include/arch/unix
+test -d $dir || $MKDIR $dir
+
AC_OUTPUT($MAKEFILE1 $MAKEFILE2 $MAKEFILE3 include/apr.h APRVARS,[
SAVE_FILES="include/apr.h include/apr_private.h"
@@ -855,7 +858,11 @@
EOF
) | cat - $makefile | \
- sed -e 's#-I\($(INCDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' > tmp
+ 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' \
+ -e 's#-I\($(DEFOSDIR[0-9]*)\)#-I\1 -I$(srcdir)\1#g' \
+ > tmp
cp tmp $makefile
done
if test -n "$USE_MM"; then
1.14 +3 -1 apr/dso/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/dso/unix/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- Makefile.in 2000/11/15 11:49:40 1.13
+++ Makefile.in 2000/12/15 16:56:54 1.14
@@ -6,7 +6,9 @@
LIBS=@LIBS@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
+INCDIR2=$(INCDIR)/arch
+INCDIR3=$(INCDIR)/arch/unix
+INCLUDES=-I$(INCDIR) -I$(INCDIR2) -I$(INCDIR3)
MKDEP=../../helpers/mkdep.sh
LIB=libdso.a
1.27 +1 -1 apr/dso/unix/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apr/dso/unix/dso.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -u -r1.26 -r1.27
--- dso.c 2000/12/03 05:29:50 1.26
+++ dso.c 2000/12/15 16:56:54 1.27
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "unix/dso.h"
+#include "dso.h"
#include "apr_strings.h"
#if APR_HAS_DSO
1.17 +3 -1 apr/locks/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/locks/unix/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -u -r1.16 -r1.17
--- Makefile.in 2000/11/15 11:49:59 1.16
+++ Makefile.in 2000/12/15 16:56:57 1.17
@@ -5,7 +5,9 @@
LIBS=@LIBS@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
+INCDIR2=$(INCDIR)/arch
+INCDIR3=$(INCDIR)/arch/unix
+INCLUDES=-I$(INCDIR) -I$(INCDIR2) -I$(INCDIR3)
MKDEP=../../helpers/mkdep.sh
OBJS=locks.o \
1.43 +1 -1 apr/locks/unix/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apr/locks/unix/locks.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -u -r1.42 -r1.43
--- locks.c 2000/12/01 14:00:55 1.42
+++ locks.c 2000/12/15 16:56:57 1.43
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "unix/locks.h"
+#include "locks.h"
#include "apr_strings.h"
#include "apr_portable.h"