Reorganized: sources in `src', documentation in `doc'.

diff --git a/.cvsignore b/.cvsignore
index e5ac4e046ab724d381c8355ba95b47b1daed7df0..2cf54e656d09e278b443bcec65724bed9d95b823 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,26 +1,7 @@
-*_.c
-.deps
 ChangeLog
 Makefile
 Makefile.in
 aclocal.m4
-ansi2knr
-bison
-bison.aux
-bison.cp
-bison.cps
-bison.dvi
-bison.fn
-bison.info
-bison.info-[0-9]*
-bison.ky
-bison.log
-bison.pg
-bison.ps
-bison.simple
-bison.toc
-bison.tp
-bison.vr
 config.cache
 config.h
 config.hin
@@ -28,6 +9,3 @@ config.log
 config.status
 configure
 stamp-h
-stamp-vti
-version.c
-version.texi

diff --git a/Makefile.am b/Makefile.am
index effed99792046466e0882e7f25a1d03e2e9fda87..e38f9e6fc338131e6762d106636119e52c50cca0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,32 +1,8 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-AUTOMAKE_OPTIONS = 1.4 ansi2knr
+AUTOMAKE_OPTIONS = 1.4
 
-SUBDIRS = intl po
+SUBDIRS = intl po src doc
 
-bin_PROGRAMS = bison
+EXTRA_DIST = REFERENCES configure.bat OChangeLog
 
-bison_SOURCES = LR0.c allocate.c closure.c conflicts.c derives.c       \
-    files.c getargs.c gram.c lalr.c lex.c main.c nullable.c output.c   \
-    print.c reader.c reduce.c symtab.c warshall.c version.c getopt.c   \
-    getopt1.c
-
-EXTRA_bison_SOURCES = vmsgetargs.c
-
-bison_LDADD = @ALLOCA@
-
-noinst_HEADERS = alloc.h files.h gram.h lex.h machine.h state.h        \
- symtab.h system.h types.h getopt.h
-
-data_DATA = bison.simple bison.hairy
-info_TEXINFOS = bison.texinfo
-man_MANS = bison.1
-
-EXTRA_DIST = bison.1 bison.s1 bison.hairy REFERENCES configure.bat     \
- build.com bison.cld bison.rnh vmshlp.mar OChangeLog
-
-bison.simple: bison.s1 Makefile
-       -rm -f $@
-       sed -e "/^#line/ s|bison|$(datadir)/bison|" -e "s/@bison_version@/$(VERSION)/" < $(srcdir)/bison.s1 > $@-tmp
-       mv $@-tmp $@
-
-DISTCLEANFILES = bison.simple intl/libintl.h
+DISTCLEANFILES = intl/libintl.h

diff --git a/POTFILES.in b/POTFILES.in
deleted file mode 100644 (file)
index 0794be6..0000000
--- a/POTFILES.in
+++ /dev/null
@@ -1,20 +0,0 @@
-# List of files which contain translatable strings.
-# Copyright (C) 1996 Free Software Foundation, Inc.
-
-# Package source files
-allocate.c
-closure.c
-conflicts.c
-derives.c
-getargs.c
-lalr.c
-lex.c
-main.c
-nullable.c
-output.c
-print.c
-reader.c
-reduce.c
-
-# Common library files
-getopt.c

diff --git a/configure.in b/configure.in
index 2cd7d67609b3ab8a297941de0ee0cf8a31cc54a1..654764170bc6639942cd2132f111931112ae2b04 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -44,4 +44,4 @@ BISON_DEFINE_FILE(XPFILE, PFILE)
 PFILE1="${datadir}/bison.hairy"
 BISON_DEFINE_FILE(XPFILE1, PFILE1)
 
-AC_OUTPUT(Makefile intl/Makefile po/Makefile.in)
+AC_OUTPUT(Makefile intl/Makefile po/Makefile.in src/Makefile doc/Makefile)

diff --git a/doc/.cvsignore b/doc/.cvsignore
new file mode 100644 (file)
index 0000000..64f139a
--- /dev/null
+++ b/doc/.cvsignore
@@ -0,0 +1,19 @@
+ChangeLog
+Makefile
+Makefile.in
+bison.aux
+bison.cp
+bison.cps
+bison.dvi
+bison.fn
+bison.info
+bison.info-[0-9]*
+bison.ky
+bison.log
+bison.pg
+bison.ps
+bison.toc
+bison.tp
+bison.vr
+stamp-vti
+version.texi

diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644 (file)
index 0000000..0e92ad2
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,7 @@
+## Process this file with automake to produce Makefile.in -*-Makefile-*-
+AUTOMAKE_OPTIONS = 1.4
+
+info_TEXINFOS = bison.texinfo
+man_MANS = bison.1
+
+EXTRA_DIST = bison.1 bison.rnh

diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644 (file)
index 0000000..717c7b5
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1,8 @@
+*_.c
+.deps
+ChangeLog
+Makefile
+Makefile.in
+ansi2knr
+bison
+bison.simple

diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644 (file)
index 0000000..260846b
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,27 @@
+## Process this file with automake to produce Makefile.in -*-Makefile-*-
+AUTOMAKE_OPTIONS = 1.4 ansi2knr
+
+bin_PROGRAMS = bison
+
+bison_SOURCES = LR0.c allocate.c closure.c conflicts.c derives.c       \
+    files.c getargs.c gram.c lalr.c lex.c main.c nullable.c output.c   \
+    print.c reader.c reduce.c symtab.c warshall.c version.c getopt.c   \
+    getopt1.c
+
+EXTRA_bison_SOURCES = vmsgetargs.c
+
+bison_LDADD = @ALLOCA@
+
+noinst_HEADERS = alloc.h files.h gram.h lex.h machine.h state.h        \
+ symtab.h system.h types.h getopt.h
+
+data_DATA = bison.simple bison.hairy
+
+EXTRA_DIST = bison.s1 bison.hairy build.com bison.cld vmshlp.mar
+
+bison.simple: bison.s1 Makefile
+       -rm -f $@
+       sed -e "/^#line/ s|bison|$(datadir)/bison|" -e "s/@bison_version@/$(VERSION)/" < $(srcdir)/bison.s1 > $@-tmp
+       mv $@-tmp $@
+
+DISTCLEANFILES = bison.simple