Remove etc/Makefile.am.

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

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

diff --git a/Makefile.am b/Makefile.am
index 3362bd6ff9246822eb7260cd86c1e64a098040ca..188a0e3ec0cda77b4b5888e9eb9fec6bc1fd5454 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = po runtime-po lib data src doc tests etc
+SUBDIRS = po runtime-po lib data src doc tests
 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
+include etc/local.mk
 include examples/local.mk
 
 .PHONY: maintainer-check

diff --git a/configure.ac b/configure.ac
index 51e0553f4c1cec693e909f0fc8548795051dd5a4..29117f1d163b1481e0b4115146461463460abd46 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -151,7 +151,6 @@ gt_JAVAEXEC
 AC_CONFIG_FILES([Makefile
                 po/Makefile.in
                 data/Makefile
-                etc/Makefile
                 examples/calc++/Makefile
                 lib/Makefile src/Makefile
                 doc/Makefile

diff --git a/etc/Makefile.am b/etc/Makefile.am
deleted file mode 100644 (file)
index 8896606..0000000
--- a/etc/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-## Copyright (C) 2006 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/>.
-
-nodist_noinst_SCRIPTS = bench.pl

diff --git a/etc/local.mk b/etc/local.mk
new file mode 100644 (file)
index 0000000..e66b1bb
--- /dev/null
+++ b/etc/local.mk
@@ -0,0 +1,16 @@
+## Copyright (C) 2006, 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/>.
+
+nodist_noinst_SCRIPTS = etc/bench.pl