[Libphidget-cvs-commits] CVS: libphidget Makefile.am,1.4,1.5 configure.in,1.4,1.5

[Vadim T. <vt...@us...>]

Update of /cvsroot/libphidget/libphidget
In directory usw-pr-cvs1:/tmp/cvs-serv16807

Modified Files:
	Makefile.am configure.in 
Log Message:
- Fixed yet another 'make dist' dependency
- 'make indent' is smarter now, the files that haven't changed don't change
  the timestamp now, though there's a problem with a few of them - indent
  flips the syntax back and forth on every run...


Index: Makefile.am
===================================================================
RCS file: /cvsroot/libphidget/libphidget/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	8 Sep 2002 04:29:44 -0000	1.4
--- Makefile.am	9 Sep 2002 09:40:42 -0000	1.5
***************
*** 2,6 ****
  
  SUBDIRS = src
! EXTRA_DIST = bootstrap src/scripts/install/*
  
  clean-generic:
--- 2,6 ----
  
  SUBDIRS = src
! EXTRA_DIST = bootstrap indent.rules src/scripts/install/*
  
  clean-generic:
***************
*** 10,20 ****
  indent:
  
  	@ for FILE in `@FIND@ . -name "*.h" -o -name "*.c" -o -name "*.cc"` ; do \
! 	      @INDENT@ --ignore-profile `@CAT@ ./indent.rules` $$FILE ; \
! 	  done
  
  indent-local:
  
  	@ for FILE in `@FIND@ . -name "*.h" -o -name "*.c" -o -name "*.cc"` ; do \
! 	      @INDENT@ $$FILE ; \
! 	  done
--- 10,40 ----
  indent:
  
+ 	@ if @TEST@ -z "@INDENT@" ; then \
+ 	    @ECHO@ "indent was not found, install and rerun ./configure"; \
+ 	    @RM@ -f config.cache; \
+ 	fi
+ 
  	@ for FILE in `@FIND@ . -name "*.h" -o -name "*.c" -o -name "*.cc"` ; do \
! 	    @INDENT@ --ignore-profile --standard-output `@CAT@ ./indent.rules` $$FILE > $$FILE.indent; \
! 	    if @TEST@ -n "`@DIFF@ $$FILE $$FILE.indent`" ; then \
! 	        @MV@ $$FILE.indent $$FILE; \
! 	    else \
! 	        @RM@ $$FILE.indent; \
! 	    fi; \
! 	done
  
  indent-local:
  
+ 	@ if @TEST@ -z "@INDENT@" ; then \
+ 	    @ECHO@ "indent was not found, install and rerun ./configure"; \
+ 	    @RM@ -f config.cache; \
+ 	fi
+ 
  	@ for FILE in `@FIND@ . -name "*.h" -o -name "*.c" -o -name "*.cc"` ; do \
! 	    @INDENT@ --standard-output $$FILE > $$FILE.indent; \
! 	    if @TEST@ -n "`@DIFF@ $$FILE $$FILE.indent`" ; then \
! 	        @MV@ $$FILE.indent $$FILE; \
! 	    else \
! 	        @RM@ $$FILE.indent; \
! 	    fi; \
! 	done

Index: configure.in
===================================================================
RCS file: /cvsroot/libphidget/libphidget/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure.in	8 Sep 2002 04:24:31 -0000	1.4
--- configure.in	9 Sep 2002 09:40:43 -0000	1.5
***************
*** 55,58 ****
--- 55,60 ----
  AC_PROG_FIND
  AC_PATH_PROG_VERIFY(CAT,cat,$PATH)dnl
+ AC_PATH_PROG_VERIFY(DIFF,diff,$PATH)dnl
+ AC_PATH_PROG_VERIFY(MV,mv,$PATH)dnl
  AC_PATH_PROG_VERIFY(RM,rm,$PATH)dnl
  dnl AC_PATH_PROG_VERIFY(DIRNAME,dirname,$PATH)dnl