cvs commit: apachen/src/regex Makefile
coar97/09/10 13:05:41 Modified:src Configure src/main Makefile.tmpl src/modules/proxy Makefile src/os/unix Makefile.tmpl src/regex Makefile Log: Remove the v flag from the library generation - verbositi excessivitore.. Reviewed by: Jim Jagielski, Paul Sutton Revision ChangesPath 1.153 +1 -1 apachen/src/Configure Index: Configure === RCS file: /export/home/cvs/apachen/src/Configure,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- Configure 1997/09/10 12:13:29 1.152 +++ Configure 1997/09/10 20:05:35 1.153 @@ -1060,7 +1060,7 @@ $(LIB): $(OBJS) rm -f $@ - ar crv $@ $(OBJS) + ar cr $@ $(OBJS) $(RANLIB) $@ .c.o: 1.4 +1 -1 apachen/src/main/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apachen/src/main/Makefile.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.tmpl 1997/09/03 08:30:06 1.3 +++ Makefile.tmpl 1997/09/10 20:05:37 1.4 @@ -22,7 +22,7 @@ $(LIB): $(OBJS) rm -f $@ - ar crv $@ $(OBJS) + ar cr $@ $(OBJS) $(RANLIB) $@ clean: 1.16 +1 -1 apachen/src/modules/proxy/Makefile Index: Makefile === RCS file: /export/home/cvs/apachen/src/modules/proxy/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile 1997/08/23 22:23:11 1.15 +++ Makefile 1997/09/10 20:05:38 1.16 @@ -75,7 +75,7 @@ rm -f $(LIB) $(LIB): $(OBJS) - ar crv $@ $(OBJS) + ar cr $@ $(OBJS) $(RANLIB) $@ clean: 1.4 +1 -1 apachen/src/os/unix/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apachen/src/os/unix/Makefile.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.tmpl 1997/09/03 08:30:07 1.3 +++ Makefile.tmpl 1997/09/10 20:05:39 1.4 @@ -12,7 +12,7 @@ $(LIB): $(OBJS) rm -f $@ - ar crv $@ $(OBJS) + ar cr $@ $(OBJS) $(RANLIB) $@ .c.o: 1.7 +1 -1 apachen/src/regex/Makefile Index: Makefile === RCS file: /export/home/cvs/apachen/src/regex/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 1997/09/06 23:38:43 1.6 +++ Makefile 1997/09/10 20:05:40 1.7 @@ -37,7 +37,7 @@ all lib: purge $(OBJPRODN) rm -f libregex.a - ar crv libregex.a $(OBJPRODN) + ar cr libregex.a $(OBJPRODN) $(RANLIB) libregex.a default: r
cvs commit: apachen/src/regex Makefile
jim 97/09/06 16:38:43
Modified:src Configure Makefile.tmpl
src/regex Makefile
Log:
Configure cleanup: treat regex like a regular directory in the
Makefile/build process
Revision ChangesPath
1.149 +3 -0 apachen/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- Configure 1997/09/06 22:32:19 1.148
+++ Configure 1997/09/06 23:38:39 1.149
@@ -26,6 +26,7 @@
tmpfile3=$tmpfile.3
awkfile=$tmpfile.4
SRCDIR=`pwd`
+SUBDIRS='main $(OSDIR) modules'
## Now handle any arguments, which, for now, is -file
@@ -658,6 +659,7 @@
#
if [ $RULE_WANTHSREGEX = yes ]; then
REGLIB=regex/libregex.a
+SUBDIRS=$SUBDIRS regex
INCLUDES=$INCLUDES -I${SRCDIR}/regex
fi
@@ -931,6 +933,7 @@
echo SHELL=$SHELL Makefile.config
echo OSOBJ=${SRCDIR}/$OSDIR/os.o Makefile.config
echo OSDIR=${SRCDIR}/$OSDIR Makefile.config
+echo SUBDIRS=$SUBDIRS Makefile.config
echo Makefile.config
echo End of Configure created section Makefile.config
1.63 +1 -6 apachen/src/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apachen/src/Makefile.tmpl,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Makefile.tmpl 1997/09/03 13:20:43 1.62
+++ Makefile.tmpl 1997/09/06 23:38:40 1.63
@@ -14,8 +14,6 @@
$(OSDIR)/libos.a \
main/libmain.a
-SUBDIRS=main $(OSDIR) modules
-
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $
@@ -28,7 +26,7 @@
@echo If not, you will at least have to touch @@Configuration@@.
@false
-httpd: $(REGLIB) modules.o subdirs
+httpd: modules.o subdirs
rm -f buildmark.c
echo 'const char SERVER_BUILT[] = '`date`';' buildmark.c
$(CC) -c $(CFLAGS) buildmark.c
@@ -38,9 +36,6 @@
for i in $(SUBDIRS); do \
( cd $$i; $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)'
RANLIB='$(RANLIB)') \
done
-
-$(REGLIB):
- (cd regex; $(MAKE) lib CC='$(CC)' AUX_CFLAGS='$(CFLAGS)'
RANLIB='$(RANLIB)')
support: support-dir
1.6 +3 -3 apachen/src/regex/Makefile
Index: Makefile
===
RCS file: /export/home/cvs/apachen/src/regex/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile 1997/07/08 18:05:39 1.5
+++ Makefile 1997/09/06 23:38:43 1.6
@@ -35,12 +35,12 @@
.c.ih:
sh ./mkh $(MKHFLAGS) -p $ $@
-default: r
-
-lib: purge $(OBJPRODN)
+all lib: purge $(OBJPRODN)
rm -f libregex.a
ar crv libregex.a $(OBJPRODN)
$(RANLIB) libregex.a
+
+default: r
purge:
rm -f *.o
