httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@hyperreal.org>
Subject cvs commit: apachen/src/regex Makefile
Date Sat, 06 Sep 1997 23:38:44 GMT
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  Changes    Path
  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
  
  
  

Mime
View raw message