[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Remove etc/Makefile.am.
From: |
Akim Demaille |
Subject: |
[PATCH] Remove etc/Makefile.am. |
Date: |
Sat, 15 Nov 2008 09:39:42 -0000 |
* etc/Makefile.am: Rename as...
* etc/local.mk: this.
Adjust.
* Makefile.am, configure.ac: Adjust.
---
ChangeLog | 8 ++++++++
Makefile.am | 3 ++-
configure.ac | 1 -
etc/Makefile.am | 16 ----------------
etc/local.mk | 16 ++++++++++++++++
5 files changed, 26 insertions(+), 18 deletions(-)
delete mode 100644 etc/Makefile.am
create mode 100644 etc/local.mk
diff --git a/ChangeLog b/ChangeLog
index 707aad9..980bd63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2008-11-15 Akim Demaille <address@hidden>
+ Remove etc/Makefile.am.
+ * etc/Makefile.am: Rename as...
+ * etc/local.mk: this.
+ Adjust.
+ * Makefile.am, configure.ac: Adjust.
+
+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.
diff --git a/Makefile.am b/Makefile.am
index 3362bd6..188a0e3 100644
--- 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 51e0553..29117f1 100644
--- 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
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
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
--
1.6.0.2.588.g3102
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] Remove etc/Makefile.am.,
Akim Demaille <=