bjh 99/10/23 21:22:23
Modified: src/lib/apr .cvsignore Makefile.in
src/lib/apr/test Makefile.in
Log:
Make a single APR library file.
Revision Changes Path
1.3 +1 -1 apache-2.0/src/lib/apr/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1999/09/11 03:17:42 1.2
+++ .cvsignore 1999/10/24 04:22:21 1.3
@@ -2,5 +2,5 @@
config.cache
config.log
config.status
-libs
configure
+objs
1.12 +7 -5 apache-2.0/src/lib/apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 1999/10/10 20:34:52 1.11
+++ Makefile.in 1999/10/24 04:22:22 1.12
@@ -39,12 +39,14 @@
# building the entire package.
#
all: Makefile $(MODULES) subdirs
- @rm -Rf libs
- @mkdir libs
- @for i in $(SUBDIRS); do cp $$i/*.a libs ; done;
+ @rm -Rf objs
+ @mkdir objs
+ @rm -f @[EMAIL PROTECTED]
+ @for i in $(SUBDIRS); do cp $$i/*.o objs ; done;
+ @$(AR) cr @[EMAIL PROTECTED] objs/*.o
clean: subdirs_clean
- $(RM) -f *.o *.a *.so
+ $(RM) -f *.o *.a *.so objs/*.o
depend: subdirs_depend
@@ -52,7 +54,7 @@
-$(RM) -f *.o *.a *.so
-$(RM) -f config.cache config.status config.log
-$(RM) -f Makefile
- -$(RM) -Rf libs
+ -$(RM) -Rf objs
subdirs:
@for i in $(SUBDIRS); do \
1.8 +2 -2 apache-2.0/src/lib/apr/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in 1999/10/20 20:24:06 1.7
+++ Makefile.in 1999/10/24 04:22:22 1.8
@@ -8,7 +8,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ @OPTIM@
-LIBS=-L../libs -lnetwork -lthreadproc -lfile -lmisc -lapr -ltime -llock
-lsig -lmmap @LIBS@
+LIBS=-L.. -lapr @LIBS@
[EMAIL PROTECTED]@ $(LIBS)
INCDIR=../include
INCDIR1=../../inc
@@ -24,7 +24,7 @@
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
- [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
OBJS= testfile.o \
testproc.o \
