diff options
| author | Akim Demaille <demaille@gostai.com> | 2008-09-23 15:05:51 +0200 |
|---|---|---|
| committer | Akim Demaille <demaille@gostai.com> | 2008-11-15 10:39:38 +0100 |
| commit | 6a5aa0cdbb6468a33a3c131a6fca0cbba1e6ccfa (patch) | |
| tree | f07f861bac1280c8386d70fcdb1c0a9b7f2f2bdc | |
| parent | 7cb794dcdddf4a4e20c5355d1912600889e5d1b6 (diff) | |
| download | bison-6a5aa0cdbb6468a33a3c131a6fca0cbba1e6ccfa.tar.gz | |
Remove data/Makefile.am.
* data/Makefile.am: Rename as...
* data/local.mk: this.
Adjust paths.
* Makefile.am, configure.ac: Adjust.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | data/local.mk (renamed from data/Makefile.am) | 31 |
4 files changed, 32 insertions, 11 deletions
@@ -1,5 +1,13 @@ 2008-11-15 Akim Demaille <demaille@gostai.com> + 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 <demaille@gostai.com> + Remove etc/Makefile.am. * etc/Makefile.am: Rename as... * etc/local.mk: this. diff --git a/Makefile.am b/Makefile.am index 188a0e3e..dd20d5d0 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 29117f1d..83eb9c37 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/local.mk index ce15daca..35394f5f 100644 --- a/data/Makefile.am +++ b/data/local.mk @@ -13,17 +13,30 @@ # 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 +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 = m4sugar/m4sugar.m4 m4sugar/foreach.m4 +dist_m4sugar_DATA = \ + data/m4sugar/foreach.m4 \ + data/m4sugar/m4sugar.m4 xsltdir = $(pkgdatadir)/xslt dist_xslt_DATA = \ - xslt/bison.xsl \ - xslt/xml2dot.xsl \ - xslt/xml2text.xsl \ - xslt/xml2xhtml.xsl + data/xslt/bison.xsl \ + data/xslt/xml2dot.xsl \ + data/xslt/xml2text.xsl \ + data/xslt/xml2xhtml.xsl |