[Commit] nickle ChangeLog, 1.51, 1.52 Makefile.am, 1.53, 1.54 builtin.c, 1.17, 1.18 configure.in, 1.33, 1.34

[Keith Packard]

Committed by: keithp

Update of /local/src/CVS/nickle
In directory home.keithp.com:/tmp/cvs-serv21730

Modified Files:
	ChangeLog Makefile.am builtin.c configure.in 
Log Message:
2004-05-25  Keith Packard  <keithp at keithp.com>

	* Makefile.am:
	* builtin.c:
	* configure.in:
	Completely ignore VERSION support from configure and grub it
	out of the ChangeLog using $(shell) from the Makefile.


Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/nickle/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- a/ChangeLog	26 May 2004 03:35:27 -0000	1.51
+++ b/ChangeLog	26 May 2004 05:52:53 -0000	1.52
@@ -1,5 +1,13 @@
 2004-05-25  Keith Packard  <keithp at keithp.com>
 
+	* Makefile.am:
+	* builtin.c:
+	* configure.in:
+	Completely ignore VERSION support from configure and grub it
+	out of the ChangeLog using $(shell) from the Makefile.
+
+2004-05-25  Keith Packard  <keithp at keithp.com>
+
 	* debian/changelog:
 	Add comments for version 2.35
 

Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/nickle/Makefile.am,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- a/Makefile.am	23 May 2004 06:01:51 -0000	1.53
+++ b/Makefile.am	26 May 2004 05:52:53 -0000	1.54
@@ -6,6 +6,9 @@
 
 SUBDIRS = bench test
 
+VERSION = $(shell sh $(top_builddir)/version-sh $(top_srcdir)/ChangeLog)
+BUILD_DATE = $(shell sh $(top_builddir)/date-sh)
+
 NICKLEFILES = builtin.5c math.5c scanf.5c mutex.5c \
 	arc4.5c prng.5c command.5c abort.5c \
         printf.5c history.5c ctype.5c string.5c socket.5c \
@@ -39,19 +42,20 @@
 	builtin-thread.c builtin-toplevel.c builtin.c builtin.h \
 	gram.y lex.l
 
-CLEANFILES=version.h
-
 pkgdata_DATA = $(NICKLEFILES)
 
 man_MANS = nickle.1
 
 AM_YFLAGS = -d
 
-DEFINES = -DBUILD=\""`sh $(top_builddir)/date-sh`"\"
+AM_CPPFLAGS = \
+	-DBUILD=\""$(BUILD_DATE)"\" \
+	-DBUILD_VERSION=\""$(VERSION)"\"
 
-AM_CFLAGS = -Wall -Wpointer-arith -Wstrict-prototypes \
+AM_CFLAGS = \
+	-Wall -Wpointer-arith -Wstrict-prototypes \
 	-Wmissing-prototypes -Wmissing-declarations \
-	-Wnested-externs -fno-strict-aliasing $(DEFINES)
+	-Wnested-externs -fno-strict-aliasing
 
 USES_GRAM_H = \
 	compile.o \
@@ -65,10 +69,7 @@
 
 $(USES_GRAM_H): gram.h
 
-builtin.o: version.h
-
-version.h: $(top_srcdir)/make-version.sh $(top_srcdir)/ChangeLog
-	sh $(top_srcdir)/make-version.sh $(top_srcdir)/ChangeLog
+builtin.o: ChangeLog
 
 debuild debuild-signed: debuild-dirs
 	(cd $(distdir)/debian && debuild)

Index: builtin.c
===================================================================
RCS file: /local/src/CVS/nickle/builtin.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- a/builtin.c	11 Apr 2004 06:06:51 -0000	1.17
+++ b/builtin.c	26 May 2004 05:52:53 -0000	1.18
@@ -13,7 +13,6 @@
  */
 
 #include	"builtin.h"
-#include	"version.h"
 
 struct sbuiltin {
     char	    *value;

Index: configure.in
===================================================================
RCS file: /local/src/CVS/nickle/configure.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- a/configure.in	16 Apr 2004 21:41:52 -0000	1.33
+++ b/configure.in	26 May 2004 05:52:53 -0000	1.34
@@ -6,12 +6,9 @@
 
 AC_PREREQ(2.59)
 
-sinclude([version.m4])
-ifdef([VERSION_NUMBER],,[define([VERSION_NUMBER],[0.00])])
-
 AC_INIT
 AC_CONFIG_SRCDIR([nickle.h])
-AM_INIT_AUTOMAKE(nickle,VERSION_NUMBER)
+AM_INIT_AUTOMAKE(nickle,0.0)
 AM_MAINTAINER_MODE
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
@@ -91,6 +88,7 @@
  test/Makefile
  bench/Makefile
  date-sh
+ version-sh
  nickle.1
  nickle.spec)