Remove examples/local.mk.

examples/calc++/Makefile.am might be interesting to keep as is, since
it is an example in itself.

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

diff --git a/ChangeLog b/ChangeLog
index bbdeb2d685af0d040d8f3672899e85bcbe3cdd8e..707aad9de9fefc1f7b7edf2da50a05c67585c354 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-11-15  Akim Demaille  <demaille@gostai.com>
+
+       Remove examples/local.mk.
+       examples/calc++/Makefile.am might be interesting to keep as is, since
+       it is an example in itself.
+       
+       * examples/Makefile.am: Rename as...
+       * examples/local.mk: this.
+       Adjust.
+       * Makefile.am, configure.ac: Adjust.
+
 2008-11-15  Akim Demaille  <demaille@gostai.com>
 
        Remove build-aux/Makefile.am.

diff --git a/Makefile.am b/Makefile.am
index 90bef28a3fd5a83a64499f2caff89377a38f244f..3362bd6ff9246822eb7260cd86c1e64a098040ca 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,10 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = po runtime-po lib data src doc examples tests etc
+SUBDIRS = po runtime-po lib data src doc tests etc
+if BISON_CXX_WORKS
+SUBDIRS += examples/calc++
+endif
 
 # Files installed for use by Automake.
 aclocaldir = @aclocaldir@
@@ -31,6 +34,7 @@ EXTRA_DIST = .prev-version .version cfg.mk maint.mk \
   djgpp/fnchange.lst djgpp/testsuite.sed
 
 include build-aux/local.mk
+include examples/local.mk
 
 .PHONY: maintainer-check
 maintainer-check:

diff --git a/configure.ac b/configure.ac
index 496f6e83964bdfc043c840a1631f9fa9dbe5a783..51e0553f4c1cec693e909f0fc8548795051dd5a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -152,8 +152,7 @@ AC_CONFIG_FILES([Makefile
                 po/Makefile.in
                 data/Makefile
                 etc/Makefile
-                examples/Makefile
-                   examples/calc++/Makefile
+                examples/calc++/Makefile
                 lib/Makefile src/Makefile
                 doc/Makefile
                   doc/yacc.1])

diff --git a/examples/Makefile.am b/examples/Makefile.am
deleted file mode 100644 (file)
index 4f2176f..0000000
--- a/examples/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2005 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/>.
-
-if BISON_CXX_WORKS
-SUBDIRS = calc++
-endif
-
-dist_noinst_SCRIPTS = extexi

diff --git a/examples/local.mk b/examples/local.mk
new file mode 100644 (file)
index 0000000..0718b67
--- /dev/null
+++ b/examples/local.mk
@@ -0,0 +1,16 @@
+## Copyright (C) 2005, 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_noinst_SCRIPTS = examples/extexi