[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Remove examples/local.mk.
From: |
Akim Demaille |
Subject: |
[PATCH] Remove examples/local.mk. |
Date: |
Sat, 15 Nov 2008 09:34:56 -0000 |
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.
---
ChangeLog | 11 +++++++++++
Makefile.am | 6 +++++-
configure.ac | 3 +--
examples/Makefile.am | 21 ---------------------
examples/local.mk | 16 ++++++++++++++++
5 files changed, 33 insertions(+), 24 deletions(-)
delete mode 100644 examples/Makefile.am
create mode 100644 examples/local.mk
diff --git a/ChangeLog b/ChangeLog
index bbdeb2d..707aad9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2008-11-15 Akim Demaille <address@hidden>
+ 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 <address@hidden>
+
Remove build-aux/Makefile.am.
Recursive Makefiles are really way too slow, let's get rid of some of
them.
diff --git a/Makefile.am b/Makefile.am
index 90bef28..3362bd6 100644
--- 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 496f6e8..51e0553 100644
--- 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
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
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
--
1.6.0.2.588.g3102
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] Remove examples/local.mk.,
Akim Demaille <=