rbb 99/12/20 12:03:20
Modified: src/lib/apr/file_io/unix Makefile.in
src/lib/apr/lib Makefile.in
src/lib/apr/locks/unix Makefile.in
src/lib/apr/misc/unix Makefile.in
src/lib/apr/mmap/unix Makefile.in
src/lib/apr/network_io/unix Makefile.in
src/lib/apr/threadproc/unix Makefile.in
src/lib/apr/time/unix Makefile.in
Log:
Fix the build process for APR. There is no reason to build each library
individually if we are just going to combine them into one library later.
I am just commenting out those lines we don't need anymore. They will
probably go away very soon, but I want to think about it a bit more.
Revision Changes Path
1.7 +8 -9 apache-2.0/src/lib/apr/file_io/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 1999/12/03 15:18:22 1.6
+++ Makefile.in 1999/12/20 20:02:22 1.7
@@ -9,11 +9,10 @@
[EMAIL PROTECTED]@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LIBS)
-INCDIR=../../inc
-INCDIR1=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
+INCDIR=../../include
+INCLUDES=-I$(INCDIR) -I.
-LIB=libfile.a
+#LIB=libfile.a
OBJS=dir.o \
fileacc.o \
@@ -27,7 +26,7 @@
.c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(LIB)
+all: $(OBJS)
clean:
$(RM) -f *.o *.a *.so
@@ -37,10 +36,10 @@
$(OBJS): Makefile
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
+#$(LIB): $(OBJS)
+# $(RM) -f $@
+# $(AR) cr $@ $(OBJS)
+# $(RANLIB) $@
#
# We really don't expect end users to use this rule. It works only with
1.9 +6 -6 apache-2.0/src/lib/apr/lib/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 1999/12/19 18:10:01 1.8
+++ Makefile.in 1999/12/20 20:02:30 1.9
@@ -14,7 +14,7 @@
INCDIR1=../misc/@OSDIR@
INCLUDES=-I$(INCDIR) -I$(INCDIR1)
[EMAIL PROTECTED]@apr.a
[EMAIL PROTECTED]@apr.a
OBJS=apr_cpystrn.o \
apr_fnmatch.o \
@@ -30,7 +30,7 @@
.c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(LIB)
+all: $(OBJS)
clean:
$(RM) -f *.o *.a *.so
@@ -40,10 +40,10 @@
$(OBJS): Makefile
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
+#$(LIB): $(OBJS)
+# $(RM) -f $@
+# $(AR) cr $@ $(OBJS)
+# $(RANLIB) $@
#
# We really don't expect end users to use this rule. It works only with
1.6 +7 -8 apache-2.0/src/lib/apr/locks/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 1999/12/03 15:18:26 1.5
+++ Makefile.in 1999/12/20 20:02:38 1.6
@@ -9,12 +9,11 @@
[EMAIL PROTECTED]@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LIBS)
-INCDIR=../../inc
INCDIR1=../../include
INCDIR2=../../file_io/unix
-INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
+INCLUDES=-I$(INCDIR1) -I$(INCDIR2) -I.
-LIB=liblock.a
+#LIB=liblock.a
OBJS=locks.o \
crossproc.o \
@@ -23,7 +22,7 @@
.c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(LIB)
+all: $(OBJS)
clean:
$(RM) -f *.o *.a *.so
@@ -33,10 +32,10 @@
$(OBJS): Makefile
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
+#$(LIB): $(OBJS)
+# $(RM) -f $@
+# $(AR) cr $@ $(OBJS)
+# $(RANLIB) $@
#
# We really don't expect end users to use this rule. It works only with
1.8 +7 -8 apache-2.0/src/lib/apr/misc/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in 1999/12/03 15:18:29 1.7
+++ Makefile.in 1999/12/20 20:02:45 1.8
@@ -9,19 +9,18 @@
[EMAIL PROTECTED]@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LIBS)
-INCDIR=../../inc
INCDIR1=../../include
INCDIR2=../../file_io/unix
-INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
+INCLUDES=-I$(INCDIR1) -I$(INCDIR2) -I.
-LIB=libmisc.a
+#LIB=libmisc.a
OBJS=start.o getopt.o
.c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(LIB)
+all: $(OBJS)
clean:
$(RM) -f *.o *.a *.so
@@ -31,10 +30,10 @@
$(OBJS): Makefile
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
+#$(LIB): $(OBJS)
+# $(RM) -f $@
+# $(AR) cr $@ $(OBJS)
+# $(RANLIB) $@
#
# We really don't expect end users to use this rule. It works only with
1.7 +7 -7 apache-2.0/src/lib/apr/mmap/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 1999/12/03 15:18:31 1.6
+++ Makefile.in 1999/12/20 20:02:52 1.7
@@ -9,8 +9,8 @@
[EMAIL PROTECTED]@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LIBS)
-INCDIR=../../inc
-INCDIR1=../../include -I../../file_io/@OSDIR@
+INCDIR=../../include
+INCDIR1=../../file_io/@OSDIR@
INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
LIB=libmmap.a
@@ -20,7 +20,7 @@
.c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(LIB)
+all: $(OBJS)
clean:
$(RM) -f *.o *.a *.so
@@ -30,10 +30,10 @@
$(OBJS): Makefile
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
+#$(LIB): $(OBJS)
+# $(RM) -f $@
+# $(AR) cr $@ $(OBJS)
+# $(RANLIB) $@
#
# We really don't expect end users to use this rule. It works only with
1.9 +7 -8 apache-2.0/src/lib/apr/network_io/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 1999/12/03 15:18:33 1.8
+++ Makefile.in 1999/12/20 20:02:58 1.9
@@ -9,9 +9,8 @@
[EMAIL PROTECTED]@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LIBS)
-INCDIR=../../inc
-INCDIR1=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
+INCDIR=../../include
+INCLUDES=-I$(INCDIR) -I.
LIB=libnetwork.a
@@ -24,7 +23,7 @@
.c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(LIB)
+all: $(OBJS)
clean:
$(RM) -f *.o *.a *.so
@@ -34,10 +33,10 @@
$(OBJS): Makefile
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
+#$(LIB): $(OBJS)
+# $(RM) -f $@
+# $(AR) cr $@ $(OBJS)
+# $(RANLIB) $@
#
# We really don't expect end users to use this rule. It works only with
1.8 +8 -9 apache-2.0/src/lib/apr/threadproc/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in 1999/12/03 15:18:37 1.7
+++ Makefile.in 1999/12/20 20:03:06 1.8
@@ -9,10 +9,9 @@
[EMAIL PROTECTED]@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LIBS)
-INCDIR=../../inc
-INCDIR1=../../include
-INCDIR2=../../file_io/unix
-INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
+INCDIR=../../include
+INCDIR1=../../file_io/unix
+INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
LIB=libthreadproc.a
@@ -26,7 +25,7 @@
.c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(LIB)
+all: $(OBJS)
clean:
$(RM) -f *.o *.a *.so
@@ -36,10 +35,10 @@
$(OBJS): Makefile
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
+#$(LIB): $(OBJS)
+# $(RM) -f $@
+# $(AR) cr $@ $(OBJS)
+# $(RANLIB) $@
#
# We really don't expect end users to use this rule. It works only with
1.9 +6 -6 apache-2.0/src/lib/apr/time/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 1999/12/20 16:10:15 1.8
+++ Makefile.in 1999/12/20 20:03:17 1.9
@@ -12,7 +12,7 @@
INCDIR=../../include
INCLUDES=-I$(INCDIR) -I.
-LIB=libtime.a
+#LIB=libtime.a
OBJS=time.o \
access.o \
@@ -21,7 +21,7 @@
.c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $<
-all: $(LIB)
+all: $(OBJS)
clean:
$(RM) -f *.o *.a *.so
@@ -31,10 +31,10 @@
$(OBJS): Makefile
-$(LIB): $(OBJS)
- $(RM) -f $@
- $(AR) cr $@ $(OBJS)
- $(RANLIB) $@
+#$(LIB): $(OBJS)
+# $(RM) -f $@
+# $(AR) cr $@ $(OBJS)
+# $(RANLIB) $@
#
# We really don't expect end users to use this rule. It works only with
