[Gtk2hs-commit] gtk2hs ChangeLog,1.240,1.241 Makefile.am,1.13,1.14 configure.ac,1.8,1.9 VERSION,1.9,NONE

[Jens-Ulrik P. <ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19103

Modified Files:
	ChangeLog Makefile.am configure.ac 
Removed Files:
	VERSION 
Log Message:
remove VERSION file:

       * configure.ac: Use modern invocation of AC_INIT with name and
       version.  Call AM_INIT_AUTOMAKE without args.  No longer override
       VERSION variable with VERSION file.

       * Makefile.am (EXTRA_DIST): No longer include VERSION file.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configure.ac	28 Nov 2004 20:51:43 -0000	1.8
+++ configure.ac	1 Dec 2004 15:57:39 -0000	1.9
@@ -21,8 +21,8 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl ######################################################################
 
-AC_INIT(VERSION)
-AM_INIT_AUTOMAKE(gtk2hs, 0.9.6pre)
+AC_INIT(gtk2hs, 0.9.7pre)
+AM_INIT_AUTOMAKE
 
 dnl * We require autoconf version 2.50
 dnl We need 2.50 due to the use of OBJEXT 
@@ -431,9 +431,6 @@
   esac;
 fi
 
-# Read the version file
-VERSION=`cat $TOP/VERSION`
-
 dnl Documentation
 AC_PATH_PROG(HADDOCK,haddock)
 

--- VERSION DELETED ---

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile.am	1 Dec 2004 13:19:28 -0000	1.13
+++ Makefile.am	1 Dec 2004 15:57:39 -0000	1.14
@@ -19,7 +19,7 @@
 	tools/c2hs/base/syntax tools/c2hs/base/sysdep tools/c2hs/c	     \
 	tools/c2hs/chs tools/c2hs/gen tools/c2hs/state tools/c2hs/toplevel
 
-EXTRA_DIST = VERSION \
+EXTRA_DIST = \
 	tools/callbackGen/Signal.chs-boot1	\
 	tools/callbackGen/Signal.chs-boot2	\
 	tools/callbackGen/gtkmarshal.list	\

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- ChangeLog	1 Dec 2004 13:19:28 -0000	1.240
+++ ChangeLog	1 Dec 2004 15:57:22 -0000	1.241
@@ -1,3 +1,11 @@
+2004-12-02  Jens Petersen  <pet...@ha...>
+
+	* configure.ac: Use modern invocation of AC_INIT with name and
+	version.  Call AM_INIT_AUTOMAKE without args.  No longer override
+	VERSION variable with VERSION file.
+
+	* Makefile.am (EXTRA_DIST): No longer include VERSION file.
+
 2004-12-01 Axel Simon <A....@ke...> 
 
 	* gtk/menuComboToolbar/Toolbar.chs.pp: Removed two slashes that