[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Remove data/Makefile.am.
From: |
Akim Demaille |
Subject: |
[PATCH] Remove data/Makefile.am. |
Date: |
Sat, 15 Nov 2008 09:44:09 -0000 |
* data/Makefile.am: Rename as...
* data/local.mk: this.
Adjust paths.
* Makefile.am, configure.ac: Adjust.
---
ChangeLog | 8 ++++++++
Makefile.am | 3 ++-
configure.ac | 1 -
data/Makefile.am | 29 -----------------------------
data/local.mk | 42 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 52 insertions(+), 31 deletions(-)
delete mode 100644 data/Makefile.am
create mode 100644 data/local.mk
diff --git a/ChangeLog b/ChangeLog
index 980bd63..592ab9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2008-11-15 Akim Demaille <address@hidden>
+ 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 <address@hidden>
+
Remove etc/Makefile.am.
* etc/Makefile.am: Rename as...
* etc/local.mk: this.
diff --git a/Makefile.am b/Makefile.am
index 188a0e3..dd20d5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
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
@@ -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 data/local.mk
include etc/local.mk
include examples/local.mk
diff --git a/configure.ac b/configure.ac
index 29117f1..83eb9c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,7 +150,6 @@ gt_JAVAEXEC
AC_CONFIG_FILES([Makefile
po/Makefile.in
- data/Makefile
examples/calc++/Makefile
lib/Makefile src/Makefile
doc/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
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
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
--
1.6.0.2.588.g3102
- [PATCH] Remove data/Makefile.am.,
Akim Demaille <=
- Re: [PATCH] Remove data/Makefile.am., Samuel Tardieu, 2008/11/15
- Re: [PATCH] Remove data/Makefile.am., Akim Demaille, 2008/11/15
- Re: [PATCH] Remove data/Makefile.am., Joel E. Denny, 2008/11/15
- Re: [PATCH] Remove data/Makefile.am., Akim Demaille, 2008/11/16
- Re: [PATCH] Remove data/Makefile.am., Joel E. Denny, 2008/11/16
- Re: [PATCH] Remove data/Makefile.am., Akim Demaille, 2008/11/16
- Re: [PATCH] Remove data/Makefile.am., Joel E. Denny, 2008/11/16