httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sas...@locus.apache.org
Subject cvs commit: apache-2.0/src/build fastgen.sh rules.mk
Date Thu, 04 May 2000 20:17:23 GMT
sascha      00/05/04 13:17:22

  Modified:    src/build fastgen.sh rules.mk
  Log:
  Move the generating empty deps stuff into fastgen.sh. The .deps files
  are only used by Makefiles which are created by fastgen.sh, so fastgen
  is the natural place to create them.
  
  The "portable dirname" regex has been changed to remove any number of
  trailing slashes. Just in case. :)
  
  Revision  Changes    Path
  1.8       +3 -2      apache-2.0/src/build/fastgen.sh
  
  Index: fastgen.sh
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/build/fastgen.sh,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -u -r1.7 -r1.8
  --- fastgen.sh	2000/05/03 02:42:18	1.7
  +++ fastgen.sh	2000/05/04 20:17:21	1.8
  @@ -72,8 +72,7 @@
   
   for makefile in $@; do
     echo "creating $makefile"
  -# portable dirname
  -  dir=`echo $makefile|sed -e 's%[^/][^/]*$%%' -e 's%/$%%'`
  +  dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`
     test -d "$dir/" || $mkdir_p "$dir/"
   
     (cat <<EOF
  @@ -84,5 +83,7 @@
   VPATH        = $top_srcdir/$dir
   EOF
   )| cat - $top_srcdir/$makefile.in > $makefile
  +
  +  touch "$top_builddir/$dir/.deps"
   
   done
  
  
  
  1.15      +1 -2      apache-2.0/src/build/rules.mk
  
  Index: rules.mk
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/build/rules.mk,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -u -r1.14 -r1.15
  --- rules.mk	2000/04/30 18:27:17	1.14
  +++ rules.mk	2000/05/04 20:17:22	1.15
  @@ -113,7 +113,6 @@
   			ok=yes; \
   			target="$$target-p"; \
   		fi; \
  -		if test ! -f $$i/.deps; then touch $$i/.deps; fi; \
   		(cd $$i && $(MAKE) $$target) || exit 1; \
   	done; \
   	if test "$$otarget" = "all" && test -z '$(targets)'; then ok=yes; fi;\
  @@ -131,7 +130,7 @@
   distclean-p depend-p clean-p:
   
   depend: depend-recursive
  -	gcc -MM $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c > $(builddir)/.deps
  +	gcc -MM $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c > $(builddir)/.deps
|| true
   #	test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) $(EXTRA_INCLUDES)
*.c > .deps
   
   clean: clean-recursive clean-x
  
  
  

Mime
View raw message