[ObjectHandler-cvs] ObjectHandler/gensrc .cvsignore, 1.3, 1.4 Makefile.am, 1.2, 1.3

[Eric E. <eri...@us...>]

Update of /cvsroot/objecthandler/ObjectHandler/gensrc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25784/gensrc

Modified Files:
	.cvsignore Makefile.am 
Log Message:
merge branch and increment version number

Index: .cvsignore
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/gensrc/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** .cvsignore	27 Jul 2006 14:24:16 -0000	1.3
--- .cvsignore	14 Dec 2006 12:27:35 -0000	1.4
***************
*** 1,5 ****
  Makefile
  Makefile.in
! build
  *.user
  
--- 1,6 ----
+ build
  Makefile
  Makefile.in
! .time-stamp
  *.user
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/gensrc/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	28 Aug 2006 10:02:11 -0000	1.2
--- Makefile.am	14 Dec 2006 12:27:35 -0000	1.3
***************
*** 1,7 ****
  
! EXTRA_DIST = \
!     gensrc_vc8.vcproj \
!     gensrc.vcproj \
!     Makefile.vc
  
  dist-hook:
--- 1,23 ----
+ # gensrc.py probably needs to be re-executed if any of these change
  
! GENSRC_INPUT := metadata/functions.xml
! 
! GENSRC_PYS := scripts/gensrc.py
! 
! GENSRC_STUBS := stubs/stub.copyright \
!                 stubs/stub.excel.exports \
!                 stubs/stub.excel.includes
! 
! # this should prevent running from a distributed tarball
! EXTRA_DIST = .time-stamp \
!              gensrc_vc8.vcproj \
!              gensrc.vcproj \
!              Makefile.vc
! 
! all-local: .time-stamp
! 
! .time-stamp: $(GENSRC_INPUT) $(GENSRC_PYS) $(GENSRC_STUBS)
! 	python scripts/gensrc.py $(GENSRC_ARGS)
! 	touch .time-stamp
  
  dist-hook:
***************
*** 11,12 ****
--- 27,33 ----
  	cp -p $(srcdir)/scripts/*.py $(distdir)/scripts
  	cp -p $(srcdir)/stubs/stub.* $(distdir)/stubs
+ 	touch .time-stamp
+ 
+ clean:
+ 	rm -f .time-stamp
+