You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by gs...@apache.org on 2001/01/09 12:06:29 UTC
cvs commit: apr/user/unix .cvsignore Makefile.in
gstein 01/01/09 03:06:29
Modified: . .cvsignore CHANGES Makefile.in STATUS buildconf
configure.in
dso/aix Makefile.in
dso/beos .cvsignore Makefile.in
dso/os2 .cvsignore Makefile.in
dso/os390 .cvsignore Makefile.in
dso/unix .cvsignore Makefile.in
file_io/os2 .cvsignore Makefile.in
file_io/unix .cvsignore Makefile.in
helpers apr-conf.m4
i18n/unix .cvsignore Makefile.in
lib .cvsignore Makefile.in
locks/beos .cvsignore Makefile.in
locks/os2 .cvsignore Makefile.in
locks/unix .cvsignore Makefile.in
misc/unix .cvsignore Makefile.in
mmap/unix .cvsignore Makefile.in
network_io/beos .cvsignore Makefile.in
network_io/os2 .cvsignore Makefile.in
network_io/unix .cvsignore Makefile.in
passwd .cvsignore Makefile.in
shmem/os2 .cvsignore Makefile.in
shmem/unix .cvsignore Makefile.in
strings .cvsignore Makefile.in
tables .cvsignore Makefile.in
test .cvsignore Makefile.in
threadproc/beos .cvsignore Makefile.in
threadproc/os2 .cvsignore Makefile.in
threadproc/unix .cvsignore Makefile.in
time/unix .cvsignore Makefile.in
user/unix .cvsignore Makefile.in
Added: dso/aix .cvsignore
helpers .cvsignore rules.mk.in
Removed: . aclocal.m4
Log:
Libtool-ize APR.
To simplify the task, I also shifted the Makefiles to include a rules.mk
(based on APRUTIL's with a few tweaks). Still needs some work to remove the
INCLUDES setup in all the Makefiles (these can be shared).
buildconf now does more work (and generates some output)
aclocal.m4 is based on a number of M4 files, rather than standalone
apr/test/ has been updated but is probably broken in a few ways.
objs/ is now gone. we link directly from the .lo files.
Revision Changes Path
1.3 +4 -2 apr/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- .cvsignore 2000/12/01 07:27:40 1.2
+++ .cvsignore 2001/01/09 11:05:32 1.3
@@ -3,9 +3,8 @@
config.log
config.status
configure
+libtool
APRVARS
-objs
-.deps
LibD
LibR
Debug
@@ -14,3 +13,6 @@
*.opt
*.plg
apr.exports
+aclocal.m4
+.libs
+*.la
1.38 +3 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -u -r1.37 -r1.38
--- CHANGES 2001/01/07 00:00:06 1.37
+++ CHANGES 2001/01/09 11:05:32 1.38
@@ -1,5 +1,8 @@
Changes with APR b1
+ *) Libtool'ized APR and converted all the makefiles to share rules
+ from helpers/rules.mk. [Greg Stein]
+
*) Remove a warning on FreeBSD. FreeBSD defines TCP_NO_PUSH, but we
don't actually use it. This causes os_cork to be defined but not
used. This patch keeps us from defining os_cork and os_uncork on
1.37 +18 -80 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -u -r1.36 -r1.37
--- Makefile.in 2000/12/31 13:04:01 1.36
+++ Makefile.in 2001/01/09 11:05:33 1.37
@@ -1,22 +1,8 @@
#
# APR (Apache Portable Runtime) library Makefile.
#
-SHELL=@SH@
#
-# Macros for compilation commands
-#
-@SET_MAKE@
-MFLAGS_STATIC=
-RM=@RM@
-CC=@CC@
-AWK=@AWK@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
-AR=@AR@
-RANLIB=@RANLIB@
-#
# Macros for supporting directories
#
INCDIR=./include
@@ -30,81 +16,33 @@
SUBDIRS=@SUBDIRS@
#shmem/@OSDIR@
-LIBAPR = @LIBPREFIX@apr.a
+LIBAPR = @LIBPREFIX@apr.la
TARGET_EXPORTS = apr.exports
#
-# Rules for turning inputs into outputs
-#
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-#
# Rules for building specific targets, starting with 'all' for
# building the entire package.
#
-all: Makefile $(LIBAPR) delete-exports $(TARGET_EXPORTS)
+TARGETS = $(LIBAPR) delete-exports $(TARGET_EXPORTS)
-$(LIBAPR): $(MODULES) subdirs
- @rm -rf objs
- @mkdir objs
- @rm -f $@
- for i in $(SUBDIRS); do cp $$i/*.o objs ; done;
- $(AR) cr $@ objs/*.o
- $(RANLIB) $@
-
-clean: subdirs_clean
- $(RM) -f *.o *.a *.so objs/*.o apr.exports
-
-depend: subdirs_depend
-
-distclean: subdirs_distclean
- -$(RM) -f include/apr.h include/arch/unix/apr_private.h
- -$(RM) -f *.o *.a *.so
- -$(RM) -f config.cache config.status config.log
- -$(RM) -f Makefile
- -$(RM) -f APRVARS
- -$(RM) -rf objs
- cd test; $(MAKE) distclean; cd ..
-
-extraclean: distclean
- -$(RM) -f configure include/arch/unix/apr_private.h.in
-
-subdirs:
- @for i in $(SUBDIRS); do \
- echo "===> $(SDP)lib/apr/$$i"; \
- ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' \
- CC='$(CC)' AUX_CFLAGS='$(AUX_CFLAGS)' RANLIB='$(RANLIB)' ) \
- || exit 1; \
- echo "<=== $(SDP)lib/apr/$$i"; \
- done;
-
-subdirs_depend:
- @for i in $(SUBDIRS); do \
- echo "===> $(SDP)lib/apr/$$i"; \
- ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' depend ) \
- || exit 1; \
- echo "<=== $(SDP)lib/apr/$$i"; \
- done;
-
-subdirs_clean:
- @for i in $(SUBDIRS); do \
- echo "===> $(SDP)lib/apr/$$i"; \
- ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' clean ) \
- || exit 1; \
- echo "<=== $(SDP)lib/apr/$$i"; \
- done;
-
-subdirs_distclean:
- @for i in $(SUBDIRS); do \
- echo "===> $(SDP)lib/apr/$$i"; \
- ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' distclean ) \
- || exit 1; \
- echo "<=== $(SDP)lib/apr/$$i"; \
- done;
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
-install: all
+CLEAN_TARGETS = $(TARGET_EXPORTS)
+DISTCLEAN_TARGETS = config.cache config.log config.status \
+ include/apr.h include/arch/unix/apr_private.h \
+ APRVARS
+EXTRACLEAN_TARGETS = configure libtool aclocal.m4 \
+ include/arch/unix/apr_private.h.in
+
+### fix this up at some point (install location)
+libdir = /usr/local/lib
+
+$(LIBAPR): $(MODULES)
+ @for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
+ echo $(LINK) -rpath $(libdir) $$objects ; \
+ $(LINK) -rpath $(libdir) $$objects
delete-exports:
@if test -f $(TARGET_EXPORTS); then \
1.16 +3 -8 apr/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apr/STATUS,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- STATUS 2001/01/07 00:35:37 1.15
+++ STATUS 2001/01/09 11:05:33 1.16
@@ -1,5 +1,5 @@
APACHE PORTABLE RUNTIME (APR) LIBRARY STATUS: -*-text-*-
-Last modified at [$Date: 2001/01/07 00:35:37 $]
+Last modified at [$Date: 2001/01/09 11:05:33 $]
Release:
@@ -52,13 +52,6 @@
* The MM library is built as static and shared library. This should
be set up to build only the required version.
- * use libtool
- Status: Greg +1 (volunteers), Ryan +1(?)
- Waiting for commentary from jimjag
-
- * snarf rules.mk(.in) from APRUTIL to simplify makefiles
- Status: Greg +1 (volunteers), Sascha +1, rbb -0.5
-
* add apr_crypt() and APR_HAS_CRYPT for apps to determine whether the
crypt() function is available, and a way to call it (whether it is
located in libc, libcrypt, or libufc)
@@ -92,6 +85,8 @@
* use os_(un)cork in network_io/unix/sendrecv.c for FreeBSD's
sendfile implementation.
+
+ * toss the per-Makefile setup of INCLUDES; shift to rules.mk.in
Documentation that needs writing:
1.6 +28 -0 apr/buildconf
Index: buildconf
===================================================================
RCS file: /home/cvs/apr/buildconf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- buildconf 2000/12/12 12:03:41 1.5
+++ buildconf 2001/01/09 11:05:34 1.6
@@ -1,6 +1,34 @@
#!/bin/sh
+#
+# Build aclocal.m4 from libtool's libtool.m4 and our own M4 files.
+#
+ltpath=`helpers/PrintPath libtoolize`
+ltpath=`dirname $ltpath`
+ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+echo "Incorporating $ltfile into aclocal.m4 ..."
+echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf" > aclocal.m4
+echo "dnl edits here will be lost" >> aclocal.m4
+cat helpers/apr-conf.m4 apr_common.m4 hints.m4 $ltfile >> aclocal.m4
+
+#
+# Create the libtool helper files
+#
+# Note: we copy (rather than link) them to simplify distribution.
+# Note: APR supplies its own config.guess and config.sub -- we do not
+# rely on libtool's versions
+#
+echo "Copying libtool helper files ..."
+$ltpath/libtoolize --copy
+
+#
+# Generate the autoconf header and ./configure
+#
+echo "Creating include/arch/unix/apr_private.h.in ..."
autoheader
+
+echo "Creating configure ..."
+### do some work to toss config.cache?
autoconf
(cd shmem/unix/mm && autoconf)
1.206 +29 -10 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -u -r1.205 -r1.206
--- configure.in 2001/01/05 22:33:08 1.205
+++ configure.in 2001/01/09 11:05:34 1.206
@@ -22,6 +22,10 @@
abs_srcdir=`(cd $srcdir && pwd)`
abs_builddir=`pwd`
+dnl Libtool needs this symbol
+top_builddir="$abs_srcdir"
+AC_SUBST(top_builddir)
+
dnl Get location of helpers directory
dnl XXX This assumes that APR "lives" under Apache.
dnl XXX We'll need to fix this when we pull it out.
@@ -42,12 +46,10 @@
dnl # Checks for programs.
AC_PROG_CC
-AC_PROG_RANLIB_NC
AC_PROG_MAKE_SET
AC_PROG_AWK
AC_CHECK_PROG(RM, rm, rm)
AC_CHECK_TOOL(AR, ar, ar)
-SO_LDFLAG="-shared"
# This macro needs to be here in case we are on an AIX box.
AC_AIX
@@ -60,6 +62,12 @@
fi
AC_CHECK_PROG(SH, sh, sh)
+dnl
+dnl prep libtool
+dnl
+echo "performing libtool configuration..."
+AC_PROG_LIBTOOL
+
dnl #----------------------------- Checks for compiler flags
nl='
'
@@ -106,7 +114,6 @@
USE_MM=yes
AC_CHECK_DEFINE(BONE_VERSION, sys/socket.h)
eolstr="\\n"
- SO_LDFLAG="-nostart"
;;
*os390)
OSDIR="os390"
@@ -123,7 +130,6 @@
esac
AC_SUBST(eolstr)
-AC_SUBST(SO_LDFLAG)
dnl #----------------------------- Checking for Shared Memory Support
echo $ac_n "${nl}Checking for Shared Memory Support...${nl}"
@@ -851,7 +857,6 @@
AC_SUBST(LDLIBS)
AC_SUBST(OPTIM)
-AC_SUBST(RANLIB)
AC_SUBST(AR)
AC_SUBST(RM)
AC_SUBST(OSDIR)
@@ -884,6 +889,19 @@
CFLAGS="$CFLAGS $CPPFLAGS"
fi
+dnl
+dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
+dnl
+case "$host_alias" in
+*bsdi*)
+ INCLUDE_RULES=".include \"$top_builddir/helpers/rules.mk\""
+ ;;
+*)
+ INCLUDE_RULES="include $top_builddir/helpers/rules.mk"
+ ;;
+esac
+AC_SUBST(INCLUDE_RULES)
+
SAVE_FILES="include/apr.h include/arch/unix/apr_private.h"
for i in $SAVE_FILES; do
@@ -893,10 +911,12 @@
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"
-
+AC_OUTPUT([
+ $MAKEFILE1 $MAKEFILE2 $MAKEFILE3
+ include/apr.h
+ APRVARS
+ helpers/rules.mk
+],[
for i in $SAVE_FILES; do
if cmp -s $i $i.save 2>/dev/null; then
mv $i.save $i
@@ -904,7 +924,6 @@
fi
rm -f $i.save
done
-
])
dnl #----------------------------- Fixup Makefiles for VPATH support
1.7 +5 -30 apr/dso/aix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/dso/aix/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- Makefile.in 2000/11/15 17:47:37 1.6
+++ Makefile.in 2001/01/09 11:05:37 1.7
@@ -1,35 +1,10 @@
-RM=@RM@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
-INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
-MKDEP=../../helpers/mkdep.sh
-
-LIB=libdso.a
-
-OBJS=dso.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(LIB)
+TARGETS = dso.lo
-clean:
- $(RM) -f *.o *.a *.so
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
-distclean: clean
- -$(RM) -f Makefile
-
-
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
+INCDIR=../../include
+INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
# DO NOT REMOVE
1.1 apr/dso/aix/.cvsignore
Index: .cvsignore
===================================================================
Makefile
*.lo
.libs
1.2 +2 -1 apr/dso/beos/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/dso/beos/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 2000/09/16 10:19:14 1.1
+++ .cvsignore 2001/01/09 11:05:38 1.2
@@ -1,2 +1,3 @@
Makefile
-
+*.lo
+.libs
1.9 +6 -30 apr/dso/beos/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/dso/beos/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- Makefile.in 2000/12/10 12:16:49 1.8
+++ Makefile.in 2001/01/09 11:05:38 1.9
@@ -1,35 +1,11 @@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
-INCDIR=../../include
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-LIB=libdso.a
-
-OBJS=dso.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(LIB)
+TARGETS = dso.lo
-clean:
- $(RM) -f *.o *.a *.so
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
-distclean: clean
- -$(RM) -f Makefile
-
-
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
+INCDIR=../../include
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -I$(DEFOSDIR)
# DO NOT REMOVE
1.2 +2 -0 apr/dso/os2/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/dso/os2/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 2000/05/28 14:06:24 1.1
+++ .cvsignore 2001/01/09 11:05:39 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.10 +6 -31 apr/dso/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/dso/os2/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- Makefile.in 2000/11/15 16:06:03 1.9
+++ Makefile.in 2001/01/09 11:05:40 1.10
@@ -1,37 +1,12 @@
-SHELL=@SH@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = dso.lo
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
INCDIR=../../include
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-LIB=libdso.a
-
-OBJS=dso.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-all: $(LIB)
-
-clean:
- $(RM) -f *.o *.a *.so
-
-distclean: clean
- -$(RM) -f Makefile
-
-
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
1.2 +2 -0 apr/dso/os390/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/dso/os390/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 2000/08/17 14:20:13 1.1
+++ .cvsignore 2001/01/09 11:05:42 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.4 +5 -29 apr/dso/os390/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/dso/os390/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- Makefile.in 2000/11/15 11:49:35 1.3
+++ Makefile.in 2001/01/09 11:05:42 1.4
@@ -1,34 +1,10 @@
-RM=@RM@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
-INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
-MKDEP=../../helpers/mkdep.sh
-
-LIB=libdso.a
-
-OBJS=dso.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(LIB)
+TARGETS = dso.lo
-clean:
- $(RM) -f *.o *.a *.so
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
-
-distclean: clean
- -$(RM) -f Makefile
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
+INCDIR=../../include
+INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
# DO NOT REMOVE
1.2 +2 -0 apr/dso/unix/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/dso/unix/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 2000/04/10 21:44:30 1.1
+++ .cvsignore 2001/01/09 11:05:43 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.15 +6 -32 apr/dso/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/dso/unix/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- Makefile.in 2000/12/15 16:56:54 1.14
+++ Makefile.in 2001/01/09 11:05:44 1.15
@@ -1,38 +1,12 @@
-RM=@RM@
-CC=@CC@
-AR=@AR@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = dso.lo
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
INCDIR=../../include
INCDIR2=$(INCDIR)/arch
INCDIR3=$(INCDIR)/arch/unix
INCLUDES=-I$(INCDIR) -I$(INCDIR2) -I$(INCDIR3)
-MKDEP=../../helpers/mkdep.sh
-
-LIB=libdso.a
-
-OBJS=dso.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-all: $(LIB)
-
-clean:
- $(RM) -f *.o *.a *.so
-
-distclean: clean
- -$(RM) -f Makefile
-
-
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
1.2 +2 -0 apr/file_io/os2/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/file_io/os2/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 1999/08/29 12:19:03 1.1
+++ .cvsignore 2001/01/09 11:05:45 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.18 +16 -39 apr/file_io/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/file_io/os2/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -u -r1.17 -r1.18
--- Makefile.in 2000/12/04 06:00:35 1.17
+++ Makefile.in 2001/01/09 11:05:46 1.18
@@ -1,45 +1,22 @@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = \
+ dir.lo \
+ fileacc.lo \
+ filedup.lo \
+ filestat.lo \
+ open.lo \
+ pipe.lo \
+ readwrite.lo \
+ seek.lo \
+ flock.lo \
+ maperrorcode.lo
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
INCDIR=../../include
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-LIB=file.a
-
-OBJS=dir.o \
- fileacc.o \
- filedup.o \
- filestat.o \
- open.o \
- pipe.o \
- readwrite.o \
- seek.o \
- flock.o \
- maperrorcode.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-all: $(LIB)
-
-clean:
- $(RM) -f *.o *.a *.so
-
-distclean: clean
- -$(RM) -f Makefile
-
-
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
1.2 +2 -0 apr/file_io/unix/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/file_io/unix/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 1999/08/17 15:59:36 1.1
+++ .cvsignore 2001/01/09 11:05:47 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.21 +16 -32 apr/file_io/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/file_io/unix/Makefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -u -r1.20 -r1.21
--- Makefile.in 2000/11/29 07:37:41 1.20
+++ Makefile.in 2001/01/09 11:05:47 1.21
@@ -1,38 +1,22 @@
-RM=@RM@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = \
+ dir.lo \
+ fileacc.lo \
+ filedup.lo \
+ filestat.lo \
+ flock.lo \
+ fullrw.lo \
+ open.lo \
+ pipe.lo \
+ readwrite.lo \
+ seek.lo
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
INCDIR=../../include
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-OBJS=dir.o \
- fileacc.o \
- filedup.o \
- filestat.o \
- flock.o \
- fullrw.o \
- open.o \
- pipe.o \
- readwrite.o \
- seek.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-all: $(OBJS)
-
-clean:
- $(RM) -f *.o *.a *.so
-
-distclean: clean
- -$(RM) -f Makefile
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
1.3 +0 -7 apr/helpers/apr-conf.m4
Index: apr-conf.m4
===================================================================
RCS file: /home/cvs/apr/helpers/apr-conf.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- apr-conf.m4 2001/01/09 08:39:13 1.2
+++ apr-conf.m4 2001/01/09 11:05:49 1.3
@@ -303,13 +303,6 @@
fi
])
-dnl Check for ranlib but, unlike the check provided with autoconf, set
-dnl RANLIB to "true" if there is no ranlib instead of setting it to ":".
-dnl OS/390 doesn't have ranlib and the make utility doesn't parse "RANLIB=:"
-dnl the way we might want it to.
-AC_DEFUN(AC_PROG_RANLIB_NC,
-[AC_CHECK_TOOL(RANLIB, ranlib, true)])
-
AC_DEFUN(APR_EBCDIC,[
AC_CACHE_CHECK([whether system uses EBCDIC],ac_cv_ebcdic,[
1.3 +3 -2 apr/helpers/.cvsignore
1.1 apr/helpers/rules.mk.in
Index: rules.mk.in
===================================================================
# ====================================================================
# The Apache Software License, Version 1.1
#
# Copyright (c) 2000 The Apache Software Foundation. All rights
# reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
#
# 3. The end-user documentation included with the redistribution,
# if any, must include the following acknowledgment:
# "This product includes software developed by the
# Apache Software Foundation (http://www.apache.org/)."
# Alternately, this acknowledgment may appear in the software itself,
# if and wherever such third-party acknowledgments normally appear.
#
# 4. The names "Apache" and "Apache Software Foundation" must
# not be used to endorse or promote products derived from this
# software without prior written permission. For written
# permission, please contact apache@apache.org.
#
# 5. Products derived from this software may not be called "Apache",
# nor may "Apache" appear in their name, without prior written
# permission of the Apache Software Foundation.
#
# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
# ====================================================================
#
# This software consists of voluntary contributions made by many
# individuals on behalf of the Apache Software Foundation. For more
# information on the Apache Software Foundation, please see
# <http://www.apache.org/>.
#
#
# rules.mk: standard rules for APR
#
@SET_MAKE@
#
# Configuration variables
#
top_builddir=@top_builddir@
CC=@CC@
AWK=@AWK@
LIBTOOL=@LIBTOOL@
CFLAGS=@CFLAGS@ @OPTIM@ $(INCLUDES)
LIBS=@LIBS@
LDFLAGS=@LDFLAGS@
RM=@RM@
SHELL=@SHELL@
### make LTFLAGS somewhat variable?
LTFLAGS = --silent
MKDEP=$(top_builddir)/helpers/mkdep.sh
#
# Basic macro setup
#
COMPILE = $(CC) $(CFLAGS)
LT_COMPILE = $(LIBTOOL) --mode=compile $(LTFLAGS) $(COMPILE) -c $< && touch $@
LINK = $(LIBTOOL) --mode=link $(LTFLAGS) $(COMPILE) $(LDFLAGS) -o $@
#
# Standard build rules
#
all: all-recursive
depend: depend-recursive
clean: clean-recursive
distclean: distclean-recursive
extraclean: extraclean-recursive
install: all-recursive
all-recursive depend-recursive clean-recursive distclean-recursive \
extraclean-recursive:
@otarget=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; \
for i in $$list; do \
if test -d "$$i"; then \
target="$$otarget"; \
echo "Making $$target in $$i"; \
if test "$$i" = "."; then \
made_local=yes; \
target="local-$$target"; \
fi; \
(cd $$i && $(MAKE) $$target) || exit 1; \
fi; \
done; \
if test "$$otarget" = "all" && test -z "$(TARGETS)"; then \
made_local=n/a; \
fi; \
if test -z "$$made_local"; then \
$(MAKE) "local-$$otarget" || exit 1; \
fi
local-clean: x-local-clean
$(RM) -f *.o *.lo *.a *.la *.so $(CLEAN_TARGETS) $(PROGRAMS)
$(RM) -rf .libs
local-distclean: local-clean x-local-distclean
$(RM) -f Makefile $(DISTCLEAN_TARGETS)
local-extraclean: local-distclean
@if test -n "$(EXTRACLEAN_TARGETS)"; then \
echo $(RM) -f $(EXTRACLEAN_TARGETS) ; \
$(RM) -f $(EXTRACLEAN_TARGETS) ; \
fi
local-all: $(TARGETS)
local-depend:
$(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# to be filled in by the actual Makefile
x-local-clean x-local-distclean:
#
# Implicit rules for creating outputs from input files
#
.SUFFIXES:
.SUFFIXES: .c .lo .o
.c.o:
$(COMPILE) -c $<
.c.lo:
$(LT_COMPILE)
.PHONY: all depend clean distclean extraclean install \
all-recursive depend-recursive clean-recursive distclean-recursive \
extraclean-recursive
local-all local-depend local-clean local-distclean local-extraclean \
x-local-clean x-local-distclean
1.2 +2 -0 apr/i18n/unix/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/i18n/unix/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 2000/04/21 19:54:52 1.1
+++ .cvsignore 2001/01/09 11:05:50 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.11 +6 -23 apr/i18n/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/i18n/unix/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- Makefile.in 2000/12/08 04:28:52 1.10
+++ Makefile.in 2001/01/09 11:05:51 1.11
@@ -1,28 +1,11 @@
-RM=@RM@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-OBJS=xlate.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(OBJS)
+TARGETS = xlate.lo
-clean:
- $(RM) -f *.o *.a *.so
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
-distclean: clean
- -$(RM) -f Makefile
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCDIR=../../include
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
# DO NOT REMOVE
1.2 +2 -0 apr/lib/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/lib/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 1999/09/10 16:06:59 1.1
+++ .cvsignore 2001/01/09 11:05:53 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.35 +6 -24 apr/lib/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/lib/Makefile.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -u -r1.34 -r1.35
--- Makefile.in 2000/12/08 14:48:39 1.34
+++ Makefile.in 2001/01/09 11:05:53 1.35
@@ -1,30 +1,12 @@
-CC=@CC@
-RANLIB=@RANLIB@
-AR=@AR@
-RM=@RM@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = apr_pools.lo
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
INCDIR=../include
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-MKDEP=../helpers/mkdep.sh
-
-OBJS=apr_pools.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-all: $(OBJS)
-
-clean:
- $(RM) -f *.o *.a *.so
-
-distclean: clean
- -$(RM) -f Makefile
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
1.2 +2 -0 apr/locks/beos/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/locks/beos/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 2000/09/16 10:19:17 1.1
+++ .cvsignore 2001/01/09 11:05:55 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.10 +8 -31 apr/locks/beos/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/locks/beos/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- Makefile.in 2000/11/15 12:22:13 1.9
+++ Makefile.in 2001/01/09 11:05:55 1.10
@@ -1,36 +1,13 @@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
-INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
-MKDEP=../../helpers/mkdep.sh
-
-LIB=liblock.a
-
-OBJS=locks.o \
- crossproc.o \
- intraproc.o \
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(LIB)
+TARGETS =
+ locks.lo \
+ crossproc.lo \
+ intraproc.lo \
-clean:
- $(RM) -f *.o *.a *.so
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
-distclean: clean
- -$(RM) -f Makefile
-
-
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
+INCDIR=../../include
+INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
# DO NOT REMOVE
1.2 +2 -0 apr/locks/os2/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/locks/os2/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 1999/08/29 12:19:04 1.1
+++ .cvsignore 2001/01/09 11:05:57 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.12 +6 -30 apr/locks/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/locks/os2/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- Makefile.in 2000/11/15 16:06:08 1.11
+++ Makefile.in 2001/01/09 11:05:57 1.12
@@ -1,36 +1,12 @@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = locks.lo
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
INCDIR=../../include
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-LIB=lock.a
-
-OBJS=locks.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-all: $(LIB)
-
-clean:
- $(RM) -f *.o *.a *.so
-
-distclean: clean
- -$(RM) -f Makefile
-
-
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
1.2 +2 -0 apr/locks/unix/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/locks/unix/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 1999/08/17 15:59:42 1.1
+++ .cvsignore 2001/01/09 11:05:59 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.18 +9 -25 apr/locks/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/locks/unix/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -u -r1.17 -r1.18
--- Makefile.in 2000/12/15 16:56:57 1.17
+++ Makefile.in 2001/01/09 11:05:59 1.18
@@ -1,31 +1,15 @@
-RM=@RM@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = \
+ locks.lo \
+ crossproc.lo \
+ intraproc.lo
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
INCDIR=../../include
INCDIR2=$(INCDIR)/arch
INCDIR3=$(INCDIR)/arch/unix
INCLUDES=-I$(INCDIR) -I$(INCDIR2) -I$(INCDIR3)
-MKDEP=../../helpers/mkdep.sh
-
-OBJS=locks.o \
- crossproc.o \
- intraproc.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-all: $(OBJS)
-
-clean:
- $(RM) -f *.o *.a *.so
-
-distclean: clean
- -$(RM) -f Makefile
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
1.2 +2 -0 apr/misc/unix/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/misc/unix/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 1999/08/17 15:59:42 1.1
+++ .cvsignore 2001/01/09 11:06:01 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.28 +8 -24 apr/misc/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/misc/unix/Makefile.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -u -r1.27 -r1.28
--- Makefile.in 2000/12/05 22:57:48 1.27
+++ Makefile.in 2001/01/09 11:06:01 1.28
@@ -1,30 +1,14 @@
-RM=@RM@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = \
+ start.lo getopt.lo otherchild.lo errorcodes.lo rand.lo \
+ uuid.lo getuuid.lo
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
INCDIR=../../include
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-OBJS=start.o getopt.o otherchild.o errorcodes.o rand.o \
- uuid.o getuuid.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-all: $(OBJS)
-
-clean:
- $(RM) -f *.o *.a *.so
-
-distclean: clean
- -$(RM) -f Makefile
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
1.2 +2 -0 apr/mmap/unix/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/mmap/unix/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 1999/10/23 03:07:48 1.1
+++ .cvsignore 2001/01/09 11:06:02 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.18 +6 -25 apr/mmap/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/mmap/unix/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -u -r1.17 -r1.18
--- Makefile.in 2000/12/08 04:28:54 1.17
+++ Makefile.in 2001/01/09 11:06:03 1.18
@@ -1,30 +1,11 @@
-RM=@RM@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-LIB=libmmap.a
-
-OBJS=mmap.o common.o
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
+TARGETS = mmap.lo common.lo
-all: $(OBJS)
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
-clean:
- $(RM) -f *.o *.a *.so
-
-distclean: clean
- -$(RM) -f Makefile
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCDIR=../../include
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
# DO NOT REMOVE
1.2 +2 -0 apr/network_io/beos/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/network_io/beos/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 2000/09/16 10:19:18 1.1
+++ .cvsignore 2001/01/09 11:06:05 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.15 +6 -32 apr/network_io/beos/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/network_io/beos/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- Makefile.in 2000/11/18 16:53:18 1.14
+++ Makefile.in 2001/01/09 11:06:05 1.15
@@ -1,38 +1,12 @@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = poll.lo sendrecv.lo socketcommon.lo
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
INCDIR=../../include
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-LIB=libnetwork.a
-
-OBJS=poll.o \
- sendrecv.o \
- socketcommon.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-all: $(LIB)
-
-clean:
- $(RM) -f *.o *.a *.so
-
-distclean: clean
- -$(RM) -f Makefile
-
-
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
1.2 +2 -0 apr/network_io/os2/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/network_io/os2/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 1999/08/29 12:19:05 1.1
+++ .cvsignore 2001/01/09 11:06:07 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.15 +14 -37 apr/network_io/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/network_io/os2/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- Makefile.in 2000/12/07 18:10:25 1.14
+++ Makefile.in 2001/01/09 11:06:07 1.15
@@ -1,43 +1,20 @@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = \
+ poll.lo \
+ sendrecv.lo \
+ sockets.lo \
+ sockopt.lo \
+ sockaddr.lo \
+ inet_ntop.lo \
+ inet_pton.lo \
+ os2calls.lo
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
INCDIR=../../include
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-LIB=network.a
-
-OBJS=poll.o \
- sendrecv.o \
- sockets.o \
- sockopt.o \
- sockaddr.o \
- inet_ntop.o \
- inet_pton.o \
- os2calls.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-all: $(LIB)
-
-clean:
- $(RM) -f *.o *.a *.so
-
-distclean: clean
- -$(RM) -f Makefile
-
-
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
1.2 +2 -0 apr/network_io/unix/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/network_io/unix/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 1999/08/17 15:59:43 1.1
+++ .cvsignore 2001/01/09 11:06:09 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.22 +13 -31 apr/network_io/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/network_io/unix/Makefile.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -u -r1.21 -r1.22
--- Makefile.in 2000/11/16 14:48:49 1.21
+++ Makefile.in 2001/01/09 11:06:09 1.22
@@ -1,37 +1,19 @@
-RM=@RM@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = \
+ poll.lo \
+ sendrecv.lo \
+ sockets.lo \
+ sockopt.lo \
+ sockaddr.lo \
+ inet_ntop.lo \
+ inet_pton.lo
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
INCDIR=../../include
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-LIB=libnetwork.a
-
-OBJS=poll.o \
- sendrecv.o \
- sockets.o \
- sockopt.o \
- sockaddr.o \
- inet_ntop.o \
- inet_pton.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-all: $(OBJS)
-
-clean:
- $(RM) -f *.o *.a *.so
-
-distclean: clean
- -$(RM) -f Makefile
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
1.2 +2 -0 apr/passwd/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/passwd/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 2000/07/24 22:44:02 1.1
+++ .cvsignore 2001/01/09 11:06:11 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.5 +6 -25 apr/passwd/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/passwd/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- Makefile.in 2000/12/08 04:28:55 1.4
+++ Makefile.in 2001/01/09 11:06:12 1.5
@@ -1,30 +1,11 @@
-CC=@CC@
-RANLIB=@RANLIB@
-AR=@AR@
-RM=@RM@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
-INCDIR=../include
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-MKDEP=../helpers/mkdep.sh
-
-OBJS=apr_md5.o \
- apr_getpass.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(OBJS)
+TARGETS = apr_md5.lo apr_getpass.lo
-clean:
- $(RM) -f *.o *.a *.so
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
-distclean: clean
- -$(RM) -f Makefile
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
+INCDIR=../include
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
# DO NOT REMOVE
1.2 +2 -0 apr/shmem/os2/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/shmem/os2/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 2000/03/16 10:15:42 1.1
+++ .cvsignore 2001/01/09 11:06:13 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.7 +6 -30 apr/shmem/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/shmem/os2/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- Makefile.in 2000/11/15 16:06:08 1.6
+++ Makefile.in 2001/01/09 11:06:14 1.7
@@ -1,36 +1,12 @@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = shmem.lo
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
INCDIR=../../include
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-LIB=shmem.a
-
-OBJS=shmem.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-all: $(LIB)
-
-clean:
- $(RM) -f *.o *.a *.so
-
-distclean: clean
- -$(RM) -f Makefile
-
-
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
1.2 +2 -0 apr/shmem/unix/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/shmem/unix/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 2000/03/02 08:26:20 1.1
+++ .cvsignore 2001/01/09 11:06:15 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.15 +15 -29 apr/shmem/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/shmem/unix/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- Makefile.in 2000/11/15 11:50:07 1.14
+++ Makefile.in 2001/01/09 11:06:15 1.15
@@ -1,41 +1,27 @@
-RM=@RM@
-CC=@CC@
-AR=@AR@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
-INCDIR=../../include
-INCDIR1=mm
-INCLUDES=-I$(INCDIR) -I$(INCDIR1)
-MKDEP=../../helpers/mkdep.sh
-
-LIB=libshmem.a
-OBJS=shmem.o
+TARGETS = shmem.lo build-mm
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
-all: $(LIB)
+INCDIR=../../include
+INCDIR1=mm
+INCLUDES=-I$(INCDIR) -I$(INCDIR1)
-clean:
- $(RM) -f *.o *.a *.so
+x-local-clean:
(cd mm && $(MAKE) clean)
-distclean: clean
- -$(RM) -f Makefile
+x-local-distclean:
(cd mm && $(MAKE) distclean)
+# build the MM library, then copy the objects to this dir so our top-level
+# will find them and copy them to the (top)/objs directory
+MM_OBJS = \
+ mm/mm_global.lo mm/mm_alloc.lo mm/mm_core.lo mm/mm_lib.lo \
+ mm/mm_vers.lo
-$(LIB): $(OBJS)
- $(RM) -f $@
+build-mm:
(cd mm && $(MAKE) libmm.la)
- cp mm/mm_global.o mm/mm_alloc.o mm/mm_core.o mm/mm_lib.o mm/mm_vers.o .
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
+ cp $(MM_OBJS) .
# DO NOT REMOVE
1.2 +2 -0 apr/strings/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/strings/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 2000/07/21 19:50:45 1.1
+++ .cvsignore 2001/01/09 11:06:17 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.8 +11 -28 apr/strings/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/strings/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- Makefile.in 2000/12/08 04:28:56 1.7
+++ Makefile.in 2001/01/09 11:06:17 1.8
@@ -1,33 +1,16 @@
-CC=@CC@
-RANLIB=@RANLIB@
-AR=@AR@
-RM=@RM@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCDIR=../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-MKDEP=../helpers/mkdep.sh
-
-OBJS=apr_cpystrn.o \
- apr_snprintf.o \
- apr_strnatcmp.o \
- apr_strings.o \
- apr_fnmatch.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(OBJS)
+TARGETS = \
+ apr_cpystrn.lo \
+ apr_snprintf.lo \
+ apr_strnatcmp.lo \
+ apr_strings.lo \
+ apr_fnmatch.lo
-clean:
- $(RM) -f *.o *.a *.so
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
-distclean: clean
- -$(RM) -f Makefile
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCDIR=../include
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
# DO NOT REMOVE
1.2 +2 -0 apr/tables/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/tables/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 2000/07/24 23:28:08 1.1
+++ .cvsignore 2001/01/09 11:06:18 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.6 +6 -25 apr/tables/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/tables/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- Makefile.in 2000/12/08 04:28:56 1.5
+++ Makefile.in 2001/01/09 11:06:18 1.6
@@ -1,30 +1,11 @@
-CC=@CC@
-RANLIB=@RANLIB@
-AR=@AR@
-RM=@RM@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCDIR=../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-MKDEP=../helpers/mkdep.sh
-
-OBJS=apr_tables.o \
- apr_hash.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(OBJS)
+TARGETS = apr_tables.lo apr_hash.lo
-clean:
- $(RM) -f *.o *.a *.so
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
-distclean: clean
- -$(RM) -f Makefile
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCDIR=../include
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
# DO NOT REMOVE
1.12 +2 -1 apr/test/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/test/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- .cvsignore 2000/12/11 19:11:16 1.11
+++ .cvsignore 2001/01/09 11:06:19 1.12
@@ -1,4 +1,6 @@
Makefile
+*.lo
+.libs
testmd5
testmmap
htdigest
@@ -23,6 +25,5 @@
testsuite
testsuite.opt
testsuite.ncb
-testflock.tmp
testfile.tmp
testflock
1.34 +48 -72 apr/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/test/Makefile.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -u -r1.33 -r1.34
--- Makefile.in 2001/01/02 02:20:18 1.33
+++ Makefile.in 2001/01/09 11:06:20 1.34
@@ -1,15 +1,6 @@
-RM=@RM@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=-g @CFLAGS@ @OPTIM@
-LIBS=../libapr.a @LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
-INCDIR=../include
-INCLUDES=-I$(INCDIR)
-MKDEP=../helpers/mkdep.sh
-SO_LDFLAG=@SO_LDFLAG@
-TARGETS= client@EXEEXT@ \
+TARGETS = \
+ client@EXEEXT@ \
sendfile@EXEEXT@ \
server@EXEEXT@ \
testfile@EXEEXT@ \
@@ -29,90 +20,75 @@
occhild.so \
mod_test.so
-OBJS= testfile.o \
- testflock.o \
- testproc.o \
- testsock.o \
- testthread.o \
- testtime.o \
- testargs.o \
- testcontext.o \
- testmmap.o \
- testdso.o \
- testoc.o \
- testuuid.o \
- occhild.o \
- mod_test.o
+LIBS=../libapr.a @LIBS@
-.c.o:
- $(CC) -c $(CFLAGS) $(INCLUDES) $<
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
-all: $(TARGETS)
+CLEAN_TARGETS = testfile.tmp
-testfile@EXEEXT@: testfile.o
- $(CC) $(CFLAGS) -o testfile@EXEEXT@ testfile.o $(LDFLAGS)
+CFLAGS = -g @CFLAGS@ @OPTIM@
-testflock@EXEEXT@: testflock.o
- $(CC) $(CFLAGS) -o testflock@EXEEXT@ testflock.o $(LDFLAGS)
+INCDIR=../include
+INCLUDES=-I$(INCDIR)
-testdso@EXEEXT@: testdso.o
- $(CC) $(CFLAGS) --export-dynamic -fPIC testdso.o -o testdso@EXEEXT@ $(LDFLAGS)
-testoc@EXEEXT@: testoc.o
- $(CC) $(CFLAGS) -o testoc@EXEEXT@ testoc.o $(LDFLAGS)
+testfile@EXEEXT@: testfile.lo
+ $(LINK) testfile.lo
-occhild.so: occhild.o
- $(CC) $(SO_LDFLAG) occhild.o -o occhild.so
+testflock@EXEEXT@: testflock.lo
+ $(LINK) testflock.lo
-mod_test.so: mod_test.o
- $(CC) $(SO_LDFLAG) mod_test.o -o mod_test.so
+### why the export-dynamic?
+testdso@EXEEXT@: testdso.lo
+ $(LINK) --export-dynamic testdso.lo
-testargs@EXEEXT@: testargs.o
- $(CC) $(CFLAGS) -o testargs@EXEEXT@ testargs.o $(LDFLAGS)
+testoc@EXEEXT@: testoc.lo
+ $(LINK) testoc.lo
-testcontext@EXEEXT@: testcontext.o
- $(CC) $(CFLAGS) -o testcontext@EXEEXT@ testcontext.o $(LDFLAGS)
+occhild.so: occhild.lo
+ $(LINK) --module occhild.lo
-testproc@EXEEXT@: testproc.o
- $(CC) $(CFLAGS) -o testproc@EXEEXT@ testproc.o $(LDFLAGS)
+mod_test.so: mod_test.lo
+ $(LINK) --module mod_test.lo
-testthread@EXEEXT@: testthread.o
- $(CC) $(CFLAGS) -o testthread@EXEEXT@ testthread.o $(LDFLAGS)
+testargs@EXEEXT@: testargs.lo
+ $(LINK) testargs.lo
-testsock@EXEEXT@: testsock.o client@EXEEXT@ server@EXEEXT@ sendfile@EXEEXT@
- $(CC) $(CFLAGS) -o testsock@EXEEXT@ testsock.o $(LDFLAGS)
+testcontext@EXEEXT@: testcontext.lo
+ $(LINK) testcontext.lo
-client@EXEEXT@: client.o
- $(CC) $(CFLAGS) -o client@EXEEXT@ client.o $(LDFLAGS)
+testproc@EXEEXT@: testproc.lo
+ $(LINK) testproc.lo
-server@EXEEXT@: server.o sendfile.o
- $(CC) $(CFLAGS) -o server@EXEEXT@ server.o $(LDFLAGS)
+testthread@EXEEXT@: testthread.lo
+ $(LINK) testthread.lo
-sendfile@EXEEXT@: sendfile.o
- $(CC) $(CFLAGS) -o sendfile@EXEEXT@ sendfile.o $(LDFLAGS)
+testsock@EXEEXT@: testsock.lo client@EXEEXT@ server@EXEEXT@ sendfile@EXEEXT@
+ $(LINK) testsock.lo
-testtime@EXEEXT@: testtime.o
- $(CC) $(CFLAGS) -o testtime@EXEEXT@ testtime.o $(LDFLAGS)
+client@EXEEXT@: client.lo
+ $(LINK) client.lo
-testmmap@EXEEXT@: testmmap.o
- $(CC) $(CFLAGS) -o testmmap@EXEEXT@ testmmap.o $(LDFLAGS)
+server@EXEEXT@: server.lo sendfile.lo
+ $(LINK) server.lo
-testshmem@EXEEXT@: testshmem.o
- $(CC) $(CFLAGS) -o testshmem@EXEEXT@ testshmem.o $(LDFLAGS)
+sendfile@EXEEXT@: sendfile.lo
+ $(LINK) sendfile.lo
-testpipe@EXEEXT@: testpipe.o
- $(CC) $(CFLAGS) -o testpipe@EXEEXT@ testpipe.o $(LDFLAGS)
+testtime@EXEEXT@: testtime.lo
+ $(LINK) testtime.lo
-testuuid@EXEEXT@: testuuid.o
- $(CC) $(CFLAGS) -o testuuid@EXEEXT@ testuuid.o $(LDFLAGS)
+testmmap@EXEEXT@: testmmap.lo
+ $(LINK) testmmap.lo
-clean:
- $(RM) -f *.o *.a $(TARGETS) testflock.tmp
+testshmem@EXEEXT@: testshmem.lo
+ $(LINK) testshmem.lo
-distclean: clean
- -$(RM) -f Makefile
+testpipe@EXEEXT@: testpipe.lo
+ $(LINK) testpipe.lo
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
+testuuid@EXEEXT@: testuuid.lo
+ $(LINK) testuuid.lo
# DO NOT REMOVE
1.2 +2 -0 apr/threadproc/beos/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/threadproc/beos/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 2000/09/16 10:19:19 1.1
+++ .cvsignore 2001/01/09 11:06:21 1.2
@@ -1,2 +1,4 @@
Makefile
apr_proc_stub
+*.lo
+.libs
1.19 +12 -33 apr/threadproc/beos/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/threadproc/beos/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -u -r1.18 -r1.19
--- Makefile.in 2000/12/02 13:01:40 1.18
+++ Makefile.in 2001/01/09 11:06:21 1.19
@@ -1,44 +1,23 @@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = \
+ proc.lo \
+ thread.lo \
+ threadpriv.lo \
+ threadproc_common.lo \
+ apr_proc_stub
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
INCDIR=../../include
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -I$(OSDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-LIB=libthreadproc.a
-
-OBJS=proc.o \
- thread.o \
- threadpriv.o \
- threadproc_common.o \
- apr_proc_stub
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
+CLEAN_TARGETS = apr_proc_stub /boot/home/config/bin/apr_proc_stub
-all: $(LIB)
-
apr_proc_stub:
$(CC) apr_proc_stub.c \
&& cp apr_proc_stub /boot/home/config/bin
-
-clean:
- $(RM) -f *.o *.a *.so /boot/home/config/bin/apr_proc_stub apr_proc_stub
-
-distclean: clean
- -$(RM) -f Makefile
-
-
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
1.2 +2 -0 apr/threadproc/os2/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/threadproc/os2/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 1999/08/29 12:19:05 1.1
+++ .cvsignore 2001/01/09 11:06:23 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.13 +10 -33 apr/threadproc/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/threadproc/os2/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -u -r1.12 -r1.13
--- Makefile.in 2000/11/15 16:06:08 1.12
+++ Makefile.in 2001/01/09 11:06:23 1.13
@@ -1,39 +1,16 @@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = \
+ proc.lo \
+ thread.lo \
+ threadpriv.lo \
+ signals.lo
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
INCDIR=../../include
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-LIB=threadproc.a
-
-OBJS=proc.o \
- thread.o \
- threadpriv.o \
- signals.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-all: $(LIB)
-
-clean:
- $(RM) -f *.o *.a *.so
-
-distclean: clean
- -$(RM) -f Makefile
-
-
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
# DO NOT REMOVE
1.2 +2 -0 apr/threadproc/unix/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/threadproc/unix/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 1999/08/17 15:59:50 1.1
+++ .cvsignore 2001/01/09 11:06:24 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.28 +11 -29 apr/threadproc/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/threadproc/unix/Makefile.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -u -r1.27 -r1.28
--- Makefile.in 2000/12/08 04:28:57 1.27
+++ Makefile.in 2001/01/09 11:06:25 1.28
@@ -1,34 +1,16 @@
-RM=@RM@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
-INCDIR=../../include
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-LIB=libthreadproc.a
-
-OBJS=proc.o \
- procsup.o \
- thread.o \
- threadpriv.o \
- signals.o
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
+TARGETS = \
+ proc.lo \
+ procsup.lo \
+ thread.lo \
+ threadpriv.lo \
+ signals.lo
-all: $(OBJS)
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
-clean:
- $(RM) -f *.o *.a *.so
-
-distclean: clean
- -$(RM) -f Makefile
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
+INCDIR=../../include
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
# DO NOT REMOVE
1.2 +2 -0 apr/time/unix/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/time/unix/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 1999/08/17 15:59:53 1.1
+++ .cvsignore 2001/01/09 11:06:26 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.21 +6 -24 apr/time/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/time/unix/Makefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -u -r1.20 -r1.21
--- Makefile.in 2000/12/08 04:29:00 1.20
+++ Makefile.in 2001/01/09 11:06:26 1.21
@@ -1,29 +1,11 @@
-RM=@RM@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-OBJS=time.o \
- timestr.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(OBJS)
+TARGETS = time.lo timestr.lo
-clean:
- $(RM) -f *.o *.a *.so
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
-distclean: clean
- -$(RM) -f Makefile
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCDIR=../../include
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
# DO NOT REMOVE
1.2 +2 -0 apr/user/unix/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/user/unix/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 2000/11/13 03:18:18 1.1
+++ .cvsignore 2001/01/09 11:06:28 1.2
@@ -1 +1,3 @@
Makefile
+*.lo
+.libs
1.4 +6 -23 apr/user/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/user/unix/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- Makefile.in 2000/12/08 04:29:01 1.3
+++ Makefile.in 2001/01/09 11:06:28 1.4
@@ -1,28 +1,11 @@
-RM=@RM@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
-INCDIR=../../include
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-OBJS=homedir.o
-
-.c.o:
- $(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(OBJS)
+TARGETS = homedir.lo
-clean:
- $(RM) -f *.o *.a *.so
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
-distclean: clean
- -$(RM) -f Makefile
-
-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
+INCDIR=../../include
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
# DO NOT REMOVE
Re: cvs commit: apr/user/unix .cvsignore Makefile.in
Posted by rb...@covalent.net.
> > Can I suggest a possible solution for 1, and agree 100% with 2? The
> > possible solution, is to use two variables, LIBTOOL_LIBS, and
> > NON_LIBTOOL_LIBS. These names are probably wrong, call they what you want
> > to.
> >
> > The idea is that if you use LIBTOOL, you have to add the libraries in
> > LIBTOOL_LIBS, if not you have to use NON_LIBTOOL_LIBS. If you don't use
> > libtool, you basically have to add the NON_LIBTOOL_LIBS to APR_LIBS.
> >
> > Does that make sense?
>
> Somewhat... but it does mean that we'd be looking down into .libs for the
> libraries to put into NON_LIBTOOL_LIBS. Not sure what I think about that
> one... (reaching into .libs is the basic question: do we or don't we?)
I agree that is painful, but I didn't realize there was an option when not
using libtool. I thought you had to look at the .libs stuff in that case.
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
Re: cvs commit: apr/user/unix .cvsignore Makefile.in
Posted by rb...@covalent.net.
> > Somewhat... but it does mean that we'd be looking down into .libs for the
> > libraries to put into NON_LIBTOOL_LIBS. Not sure what I think about that
> > one... (reaching into .libs is the basic question: do we or don't we?)
>
> Am I correct in assuming that the point of those variables is
> to export a list of libraries which are build by APR and
> which basically form the APR library?
Basically.
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
Re: cvs commit: apr/user/unix .cvsignore Makefile.in
Posted by Sascha Schumann <sa...@schumann.cx>.
[Note: My connectivity is quite limited currently.. ]
> Somewhat... but it does mean that we'd be looking down into .libs for the
> libraries to put into NON_LIBTOOL_LIBS. Not sure what I think about that
> one... (reaching into .libs is the basic question: do we or don't we?)
Am I correct in assuming that the point of those variables is
to export a list of libraries which are build by APR and
which basically form the APR library?
Or are those variables supposed to additionally contain
external dependencies (i.e. on system libraries) for the APR
library?
- Sascha
Re: cvs commit: apr/user/unix .cvsignore Makefile.in
Posted by Greg Stein <gs...@lyra.org>.
On Wed, Jan 10, 2001 at 09:22:30PM -0800, rbb@covalent.net wrote:
>
> > It works for me.
> >
> > I only have two mild concerns:
> >
> > 1) APR's use of .la files when the user doesn't use libtool (noted above)
> > 2) APRVARS.in using variables not in the APR namespace. See apr-util's
> > export_vars.sh.in for what I think is the Right Way (and how it is used
> > in Apache's configure.in). By using unprotected names in APRVARS, we
> > might "stomp" on the user's vars.
> >
> > I've got no immediate answer for (1), and (2) is just something that has
> > been in mind for a while. I'll get around to it at some point, probably
> > after JimJag's flag revision stuff.
>
> Can I suggest a possible solution for 1, and agree 100% with 2? The
> possible solution, is to use two variables, LIBTOOL_LIBS, and
> NON_LIBTOOL_LIBS. These names are probably wrong, call they what you want
> to.
>
> The idea is that if you use LIBTOOL, you have to add the libraries in
> LIBTOOL_LIBS, if not you have to use NON_LIBTOOL_LIBS. If you don't use
> libtool, you basically have to add the NON_LIBTOOL_LIBS to APR_LIBS.
>
> Does that make sense?
Somewhat... but it does mean that we'd be looking down into .libs for the
libraries to put into NON_LIBTOOL_LIBS. Not sure what I think about that
one... (reaching into .libs is the basic question: do we or don't we?)
Sascha may have an idea here.
Cheers,
-g
--
Greg Stein, http://www.lyra.org/
Re: cvs commit: apr/user/unix .cvsignore Makefile.in
Posted by rb...@covalent.net.
> > Can I suggest a possible solution for 1, and agree 100% with 2? The
> > possible solution, is to use two variables, LIBTOOL_LIBS, and
> > NON_LIBTOOL_LIBS. These names are probably wrong, call they what you want
> > to.
>
> I guess I'm naive in wishing that an APR user using libtool could
> specify a single .la file to get APR and an APR user not using libtool
> could specify a single .a file to get APR?
>
> Why do we need a list of libraries?
Because libtool is a PITA. If you read the libtool manual, it basically
says that static libraries are an old outdated way of doing things, so
libtool implements everything as a shared library, even on platforms that
don't really support shared libraries.
What this means for us, is that they don't try to link the two libraries,
APR and MM into a single library, they would rather just use two separate
libraries. Originally, I added a hack to pull the .o files from the MM
directory, and we just used those to create our libtool library. As soon
as we went to actually using libtool for APR, that hack became incorrect,
and we either needed to change the hack, or rip it out and start over.
I made APR report to Apache which libtool libraries it is using, because
that is the "libtool" way of doing things. I think a part of our problem
with libtool is that we try to fight the way libtool wants things
done. If libtool is designed to use shared libraries, then it is likely
to work best if we do that.
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
Re: cvs commit: apr/user/unix .cvsignore Makefile.in
Posted by Jeff Trawick <tr...@bellsouth.net>.
rbb@covalent.net writes:
> Can I suggest a possible solution for 1, and agree 100% with 2? The
> possible solution, is to use two variables, LIBTOOL_LIBS, and
> NON_LIBTOOL_LIBS. These names are probably wrong, call they what you want
> to.
I guess I'm naive in wishing that an APR user using libtool could
specify a single .la file to get APR and an APR user not using libtool
could specify a single .a file to get APR?
Why do we need a list of libraries?
--
Jeff Trawick | trawickj@bellsouth.net | PGP public key at web site:
http://www.geocities.com/SiliconValley/Park/9289/
Born in Roswell... married an alien...
Re: cvs commit: apr/user/unix .cvsignore Makefile.in
Posted by rb...@covalent.net.
> It works for me.
>
> I only have two mild concerns:
>
> 1) APR's use of .la files when the user doesn't use libtool (noted above)
> 2) APRVARS.in using variables not in the APR namespace. See apr-util's
> export_vars.sh.in for what I think is the Right Way (and how it is used
> in Apache's configure.in). By using unprotected names in APRVARS, we
> might "stomp" on the user's vars.
>
> I've got no immediate answer for (1), and (2) is just something that has
> been in mind for a while. I'll get around to it at some point, probably
> after JimJag's flag revision stuff.
Can I suggest a possible solution for 1, and agree 100% with 2? The
possible solution, is to use two variables, LIBTOOL_LIBS, and
NON_LIBTOOL_LIBS. These names are probably wrong, call they what you want
to.
The idea is that if you use LIBTOOL, you have to add the libraries in
LIBTOOL_LIBS, if not you have to use NON_LIBTOOL_LIBS. If you don't use
libtool, you basically have to add the NON_LIBTOOL_LIBS to APR_LIBS.
Does that make sense?
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
Re: cvs commit: apr/user/unix .cvsignore Makefile.in
Posted by Greg Stein <gs...@lyra.org>.
On Wed, Jan 10, 2001 at 07:13:36PM -0800, rbb@covalent.net wrote:
>...
> > I'm just going to punt that stuff. Ryan made a change to allow us to tell
> > apps to include libmm.la, so that should be fine. That will also keep us
> > from poking around with the MM files, making assumptions about .lo
> > organization, etc ... much cleaner.
> >
> > The whole copy thing used to be in there, but was an artifact of the old
> > system. I think we can clear it out.
>
> Okay, I'm confused, and I've been gone for about a day and a half, so I'm
> going to ask. Forgive me. :-)
>
> Greg, I thought you said that the solution I added was wrong.
Not that I recall. There was a solution that Jeff posted from Allen which I
thought was wrong.
Your export of the LIBTOOL_LIBS is fine. It is always possible that we'll
have more in the future.
The one issue about exporting libtool libraries is when the user of APR
doesn't use libtool. That hasn't come up yet, but it certainly will. For
that case, we would need the user to install APR first (thus installing the
.a and/or .so files), so the user can link against whatever file.
[ note that your exposure of libmm.la isn't the cause: once we libtool'd
APR, then we already have the issue since we build libapr.la ]
> Or, did
> you mean that the stop-gap you used was wrong, and mine was right?
I whacked something in there, but didn't get a chance to fully test it. When
I compiled/linked Apache later in the day, I saw the mm_ link errors and
knew my quick conversion was wrong. By then, you and Jeff were already on
it, and you checked in a valid solution.
> I did
> what I needed to get it working, but I am perfectly open to new solutions.
It works for me.
I only have two mild concerns:
1) APR's use of .la files when the user doesn't use libtool (noted above)
2) APRVARS.in using variables not in the APR namespace. See apr-util's
export_vars.sh.in for what I think is the Right Way (and how it is used
in Apache's configure.in). By using unprotected names in APRVARS, we
might "stomp" on the user's vars.
I've got no immediate answer for (1), and (2) is just something that has
been in mind for a while. I'll get around to it at some point, probably
after JimJag's flag revision stuff.
Cheers,
-g
--
Greg Stein, http://www.lyra.org/
Re: cvs commit: apr/user/unix .cvsignore Makefile.in
Posted by "Victor J. Orlikowski" <v....@gte.net>.
Nope, Greg didn't like my patch :)
'cause I simply did more monkeying around to get things working.
Victor
--
Victor J. Orlikowski
======================
v.j.orlikowski@gte.net
vjo@raleigh.ibm.com
vjo@us.ibm.com
Re: cvs commit: apr/user/unix .cvsignore Makefile.in
Posted by rb...@covalent.net.
> > > > --- Makefile.in 2000/11/15 11:50:07 1.14
> > > > +++ Makefile.in 2001/01/09 11:06:15 1.15
> > > ...
> > > > + cp $(MM_OBJS) .
> > >
> > > Isn't this copying the wrong (or not enough) files? It currently
> > > copies just the .lo (timestamp) files. Maybe it should copy the .o
> > > files too.
> > >
> > > Later, libtool thinks these are the real files (I guess) and when
> > > building .libs/libapr.a it ends up creating the symbolic links (the
> > > ones that don't work with libtool 1.3.3) and putting these timestamp
> > > files in the archive.
> > >
> > > mm_malloc/mm_free/etc. are not in .libs/libapr.a. They are
> > > referenced, of course.
> >
> > I just verified that if shmem/unix/Makefile copies mm/*.lo *and*
> > mm/*.o then .libs/libapr.a has mm_malloc() et al in it.
> >
> > As an added bonus, this avoids the dependency on libtool 1.3.4.
>
> I'm just going to punt that stuff. Ryan made a change to allow us to tell
> apps to include libmm.la, so that should be fine. That will also keep us
> from poking around with the MM files, making assumptions about .lo
> organization, etc ... much cleaner.
>
> The whole copy thing used to be in there, but was an artifact of the old
> system. I think we can clear it out.
Okay, I'm confused, and I've been gone for about a day and a half, so I'm
going to ask. Forgive me. :-)
Greg, I thought you said that the solution I added was wrong. Or, did
you mean that the stop-gap you used was wrong, and mine was right? I did
what I needed to get it working, but I am perfectly open to new solutions.
Ryan
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------
Re: cvs commit: apr/user/unix .cvsignore Makefile.in
Posted by Greg Stein <gs...@lyra.org>.
On Wed, Jan 10, 2001 at 02:52:05PM -0500, Jeff Trawick wrote:
> Jeff Trawick <tr...@bellsouth.net> writes:
>
> > gstein@apache.org writes:
> >
> > > gstein 01/01/09 03:06:29
> > >
> > > Libtool-ize APR.
> > > Index: Makefile.in
> > > ===================================================================
> > > RCS file: /home/cvs/apr/shmem/unix/Makefile.in,v
> > > retrieving revision 1.14
> > > retrieving revision 1.15
> > > diff -u -u -r1.14 -r1.15
> > > --- Makefile.in 2000/11/15 11:50:07 1.14
> > > +++ Makefile.in 2001/01/09 11:06:15 1.15
> > ...
> > > + cp $(MM_OBJS) .
> >
> > Isn't this copying the wrong (or not enough) files? It currently
> > copies just the .lo (timestamp) files. Maybe it should copy the .o
> > files too.
> >
> > Later, libtool thinks these are the real files (I guess) and when
> > building .libs/libapr.a it ends up creating the symbolic links (the
> > ones that don't work with libtool 1.3.3) and putting these timestamp
> > files in the archive.
> >
> > mm_malloc/mm_free/etc. are not in .libs/libapr.a. They are
> > referenced, of course.
>
> I just verified that if shmem/unix/Makefile copies mm/*.lo *and*
> mm/*.o then .libs/libapr.a has mm_malloc() et al in it.
>
> As an added bonus, this avoids the dependency on libtool 1.3.4.
I'm just going to punt that stuff. Ryan made a change to allow us to tell
apps to include libmm.la, so that should be fine. That will also keep us
from poking around with the MM files, making assumptions about .lo
organization, etc ... much cleaner.
The whole copy thing used to be in there, but was an artifact of the old
system. I think we can clear it out.
Cheers,
-g
--
Greg Stein, http://www.lyra.org/
Re: cvs commit: apr/user/unix .cvsignore Makefile.in
Posted by Jeff Trawick <tr...@bellsouth.net>.
Jeff Trawick <tr...@bellsouth.net> writes:
> gstein@apache.org writes:
>
> > gstein 01/01/09 03:06:29
> >
> > Libtool-ize APR.
> > Index: Makefile.in
> > ===================================================================
> > RCS file: /home/cvs/apr/shmem/unix/Makefile.in,v
> > retrieving revision 1.14
> > retrieving revision 1.15
> > diff -u -u -r1.14 -r1.15
> > --- Makefile.in 2000/11/15 11:50:07 1.14
> > +++ Makefile.in 2001/01/09 11:06:15 1.15
> ...
> > + cp $(MM_OBJS) .
>
> Isn't this copying the wrong (or not enough) files? It currently
> copies just the .lo (timestamp) files. Maybe it should copy the .o
> files too.
>
> Later, libtool thinks these are the real files (I guess) and when
> building .libs/libapr.a it ends up creating the symbolic links (the
> ones that don't work with libtool 1.3.3) and putting these timestamp
> files in the archive.
>
> mm_malloc/mm_free/etc. are not in .libs/libapr.a. They are
> referenced, of course.
I just verified that if shmem/unix/Makefile copies mm/*.lo *and*
mm/*.o then .libs/libapr.a has mm_malloc() et al in it.
As an added bonus, this avoids the dependency on libtool 1.3.4.
--
Jeff Trawick | trawickj@bellsouth.net | PGP public key at web site:
http://www.geocities.com/SiliconValley/Park/9289/
Born in Roswell... married an alien...
Re: cvs commit: apr/user/unix .cvsignore Makefile.in
Posted by Jeff Trawick <tr...@bellsouth.net>.
gstein@apache.org writes:
> gstein 01/01/09 03:06:29
>
> Libtool-ize APR.
> Index: Makefile.in
> ===================================================================
> RCS file: /home/cvs/apr/shmem/unix/Makefile.in,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -u -r1.14 -r1.15
> --- Makefile.in 2000/11/15 11:50:07 1.14
> +++ Makefile.in 2001/01/09 11:06:15 1.15
...
> + cp $(MM_OBJS) .
Isn't this copying the wrong (or not enough) files? It currently
copies just the .lo (timestamp) files. Maybe it should copy the .o
files too.
Later, libtool thinks these are the real files (I guess) and when
building .libs/libapr.a it ends up creating the symbolic links (the
ones that don't work with libtool 1.3.3) and putting these timestamp
files in the archive.
mm_malloc/mm_free/etc. are not in .libs/libapr.a. They are
referenced, of course.
--
Jeff Trawick | trawickj@bellsouth.net | PGP public key at web site:
http://www.geocities.com/SiliconValley/Park/9289/
Born in Roswell... married an alien...