Remove data/Makefile.am.

	* data/Makefile.am: Rename as...
	* data/local.mk: this.
	Adjust paths.
	* Makefile.am, configure.ac: Adjust.

diff --git a/ChangeLog b/ChangeLog
index 980bd632fb89a61083cee0becc2b0a524a8a2fc1..592ab9d6cce18dd00a3b6d0d939df927f732e111 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-15  Akim Demaille  <demaille@gostai.com>
+
+       Remove data/Makefile.am.
+       * data/Makefile.am: Rename as...
+       * data/local.mk: this.
+       Adjust paths.
+       * Makefile.am, configure.ac: Adjust.
+

 2008-11-15  Akim Demaille  <demaille@gostai.com>
 
        Remove etc/Makefile.am.
 2008-11-15  Akim Demaille  <demaille@gostai.com>
 
        Remove etc/Makefile.am.

diff --git a/Makefile.am b/Makefile.am
index 188a0e3ec0cda77b4b5888e9eb9fec6bc1fd5454..dd20d5d04a82ce21a87d3b8ed59e06db2407cb78 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
 
 ACLOCAL_AMFLAGS = -I m4
 

-SUBDIRS = po runtime-po lib data src doc tests
+SUBDIRS = po runtime-po lib src doc tests

 if BISON_CXX_WORKS
 SUBDIRS += examples/calc++
 endif
 if BISON_CXX_WORKS
 SUBDIRS += examples/calc++
 endif


@@ -34,6 +34,7 @@ EXTRA_DIST = .prev-version .version cfg.mk maint.mk \
   djgpp/fnchange.lst djgpp/testsuite.sed
 
 include build-aux/local.mk
   djgpp/fnchange.lst djgpp/testsuite.sed
 
 include build-aux/local.mk

+include data/local.mk

 include etc/local.mk
 include examples/local.mk
 
 include etc/local.mk
 include examples/local.mk
 

diff --git a/configure.ac b/configure.ac
index 29117f1d163b1481e0b4115146461463460abd46..83eb9c37091c77cf3fd1f2fcfee1cf1864d666fa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -150,7 +150,6 @@ gt_JAVAEXEC
 
 AC_CONFIG_FILES([Makefile
                 po/Makefile.in
 
 AC_CONFIG_FILES([Makefile
                 po/Makefile.in

-                data/Makefile

                 examples/calc++/Makefile
                 lib/Makefile src/Makefile
                 doc/Makefile
                 examples/calc++/Makefile
                 lib/Makefile src/Makefile
                 doc/Makefile

diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644 (file)
index ce15dac..0000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-## Copyright (C) 2002, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-dist_pkgdata_DATA = README bison.m4 \
-   c-skel.m4 c.m4 yacc.c glr.c \
-   c++-skel.m4 c++.m4 location.cc lalr1.cc glr.cc \
-   java-skel.m4 java.m4 lalr1.java
-
-m4sugardir = $(pkgdatadir)/m4sugar
-dist_m4sugar_DATA = m4sugar/m4sugar.m4 m4sugar/foreach.m4
-
-xsltdir = $(pkgdatadir)/xslt
-dist_xslt_DATA =                               \
-   xslt/bison.xsl                              \
-   xslt/xml2dot.xsl                            \
-   xslt/xml2text.xsl                           \
-   xslt/xml2xhtml.xsl

diff --git a/data/local.mk b/data/local.mk
new file mode 100644 (file)
index 0000000..35394f5
--- /dev/null
+++ b/data/local.mk
@@ -0,0 +1,42 @@
+## Copyright (C) 2002, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+dist_pkgdata_DATA =                            \
+  data/README                                  \
+  data/bison.m4                                        \
+  data/c++-skel.m4                             \
+  data/c++.m4                                  \
+  data/c-skel.m4                               \
+  data/c.m4                                    \
+  data/glr.c                                   \
+  data/glr.cc                                  \
+  data/java-skel.m4                            \
+  data/java.m4                                 \
+  data/lalr1.cc                                        \
+  data/lalr1.java                              \
+  data/location.cc                             \
+  data/yacc.c
+
+m4sugardir = $(pkgdatadir)/m4sugar
+dist_m4sugar_DATA =                            \
+  data/m4sugar/foreach.m4                      \
+  data/m4sugar/m4sugar.m4
+
+xsltdir = $(pkgdatadir)/xslt
+dist_xslt_DATA =                               \
+  data/xslt/bison.xsl                          \
+  data/xslt/xml2dot.xsl                                \
+  data/xslt/xml2text.xsl                       \
+  data/xslt/xml2xhtml.xsl