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.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59544 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 56 insertions, 61 deletions

diff --git a/file_io/unix/Makefile.in b/file_io/unix/Makefile.in
index 1962a20d2..6f4dd0615 100644
--- a/file_io/unix/Makefile.in
+++ b/file_io/unix/Makefile.in
@@ -9,11 +9,10 @@ RANLIB=@RANLIB@
 CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(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 @@ OBJS=dir.o \
 .c.o:
 	$(CC) $(CFLAGS) -c $(INCLUDES) $<
 
-all: $(LIB)
+all: $(OBJS)
 
 clean:
 	$(RM) -f *.o *.a *.so
@@ -37,10 +36,10 @@ distclean: clean
 
 $(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
diff --git a/lib/Makefile.in b/lib/Makefile.in
index d03b6b95c..c92712748 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -14,7 +14,7 @@ INCDIR=../include
 INCDIR1=../misc/@OSDIR@
 INCLUDES=-I$(INCDIR) -I$(INCDIR1)
 
-LIB=@LIBPREFIX@apr.a
+#LIB=@LIBPREFIX@apr.a
 
 OBJS=apr_cpystrn.o \
 	apr_fnmatch.o \
@@ -30,7 +30,7 @@ OBJS=apr_cpystrn.o \
 .c.o:
 	$(CC) $(CFLAGS) -c $(INCLUDES) $<
 
-all: $(LIB)
+all: $(OBJS)
 
 clean:
 	$(RM) -f *.o *.a *.so
@@ -40,10 +40,10 @@ distclean: clean
 
 $(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
diff --git a/locks/unix/Makefile.in b/locks/unix/Makefile.in
index 8619800f4..53f27567c 100644
--- a/locks/unix/Makefile.in
+++ b/locks/unix/Makefile.in
@@ -9,12 +9,11 @@ RANLIB=@RANLIB@
 CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(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 @@ OBJS=locks.o \
 .c.o:
 	$(CC) $(CFLAGS) -c $(INCLUDES) $<
 
-all: $(LIB)
+all: $(OBJS)
 
 clean:
 	$(RM) -f *.o *.a *.so
@@ -33,10 +32,10 @@ distclean: clean
 
 $(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
diff --git a/misc/unix/Makefile.in b/misc/unix/Makefile.in
index 467fa7a6b..750f4e6c8 100644
--- a/misc/unix/Makefile.in
+++ b/misc/unix/Makefile.in
@@ -9,19 +9,18 @@ RANLIB=@RANLIB@
 CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(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 @@ distclean: clean
 
 $(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
diff --git a/mmap/unix/Makefile.in b/mmap/unix/Makefile.in
index 75510feef..f5f98d2fb 100644
--- a/mmap/unix/Makefile.in
+++ b/mmap/unix/Makefile.in
@@ -9,8 +9,8 @@ RANLIB=@RANLIB@
 CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(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 @@ OBJS=mmap.o common.o
 .c.o:
 	$(CC) $(CFLAGS) -c $(INCLUDES) $<
 
-all: $(LIB)
+all: $(OBJS)
 
 clean:
 	$(RM) -f *.o *.a *.so
@@ -30,10 +30,10 @@ distclean: clean
 
 $(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
diff --git a/network_io/unix/Makefile.in b/network_io/unix/Makefile.in
index 6a8955ebc..c066643e7 100644
--- a/network_io/unix/Makefile.in
+++ b/network_io/unix/Makefile.in
@@ -9,9 +9,8 @@ RANLIB=@RANLIB@
 CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(LIBS)
-INCDIR=../../inc
-INCDIR1=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
+INCDIR=../../include
+INCLUDES=-I$(INCDIR) -I.
 
 LIB=libnetwork.a
 
@@ -24,7 +23,7 @@ OBJS=poll.o \
 .c.o:
 	$(CC) $(CFLAGS) -c $(INCLUDES) $<
 
-all: $(LIB)
+all: $(OBJS)
 
 clean:
 	$(RM) -f *.o *.a *.so
@@ -34,10 +33,10 @@ distclean: clean
 
 $(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
diff --git a/threadproc/unix/Makefile.in b/threadproc/unix/Makefile.in
index 743392192..d96dbb849 100644
--- a/threadproc/unix/Makefile.in
+++ b/threadproc/unix/Makefile.in
@@ -9,10 +9,9 @@ RANLIB=@RANLIB@
 CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(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 @@ OBJS=proc.o \
 .c.o:
 	$(CC) $(CFLAGS) -c $(INCLUDES) $<
 
-all: $(LIB)
+all: $(OBJS)
 
 clean:
 	$(RM) -f *.o *.a *.so
@@ -36,10 +35,10 @@ distclean: clean
 
 $(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
diff --git a/time/unix/Makefile.in b/time/unix/Makefile.in
index fc67c014f..523334376 100644
--- a/time/unix/Makefile.in
+++ b/time/unix/Makefile.in
@@ -12,7 +12,7 @@ LDFLAGS=@LDFLAGS@ $(LIBS)
 INCDIR=../../include
 INCLUDES=-I$(INCDIR) -I.
 
-LIB=libtime.a
+#LIB=libtime.a
 
 OBJS=time.o \
 	access.o \
@@ -21,7 +21,7 @@ OBJS=time.o \
 .c.o:
 	$(CC) $(CFLAGS) -c $(INCLUDES) $<
 
-all: $(LIB)
+all: $(OBJS)
 
 clean:
 	$(RM) -f *.o *.a *.so
@@ -31,10 +31,10 @@ distclean: clean
 
 $(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