[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Remove doc/Makefile.am.
|
From: |
Akim Demaille |
|
Subject: |
[PATCH] Remove doc/Makefile.am. |
|
Date: |
Sat, 15 Nov 2008 10:13:59 -0000 |
* doc/Makefile.am: Rename as...
* doc/local.mk: this.
Adjust paths
* Makefile.am, configure.ac: Adjust.
* Makefile.am (MOSTLYCLEANFILES): New.
* src/local.mk: Adjust.
---
ChangeLog | 10 ++++
Makefile.am | 4 +-
configure.ac | 3 +-
doc/Makefile.am | 123 ------------------------------------------------------
doc/local.mk | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/local.mk | 2 +-
6 files changed, 140 insertions(+), 127 deletions(-)
delete mode 100644 doc/Makefile.am
create mode 100644 doc/local.mk
diff --git a/ChangeLog b/ChangeLog
index e3ca023..63bfaa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2008-11-15 Akim Demaille <address@hidden>
+ Remove doc/Makefile.am.
+ * doc/Makefile.am: Rename as...
+ * doc/local.mk: this.
+ Adjust paths
+ * Makefile.am, configure.ac: Adjust.
+ * Makefile.am (MOSTLYCLEANFILES): New.
+ * src/local.mk: Adjust.
+
+2008-11-15 Akim Demaille <address@hidden>
+
Move sc_tight_scope into maint.mk.
It does not work, and I don't know how it was supposed to work: it seems
to be looking for sources in the build tree. I just moved it at a
better
diff --git a/Makefile.am b/Makefile.am
index f5f888d..53d3151 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = po runtime-po lib . doc tests
+SUBDIRS = po runtime-po lib . tests
if BISON_CXX_WORKS
SUBDIRS += examples/calc++
endif
@@ -35,8 +35,10 @@ EXTRA_DIST = .prev-version .version cfg.mk maint.mk \
# Initialization before completion by local.mk's.
BUILT_SOURCES =
+MOSTLYCLEANFILES =
include build-aux/local.mk
include data/local.mk
+include doc/local.mk
include etc/local.mk
include examples/local.mk
include src/local.mk
diff --git a/configure.ac b/configure.ac
index 659c312..d1a9f03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,6 +152,5 @@ AC_CONFIG_FILES([Makefile
po/Makefile.in
examples/calc++/Makefile
lib/Makefile
- doc/Makefile
- doc/yacc.1])
+ doc/yacc.1])
AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 8ae8251..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,123 +0,0 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2001, 2002, 2003, 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/>.
-
-AM_MAKEINFOFLAGS = --no-split
-info_TEXINFOS = bison.texinfo
-bison_TEXINFOS = $(srcdir)/cross-options.texi gpl-3.0.texi fdl.texi
-
-CLEANFILES = bison.fns
-CLEANDIRS = *.t2d
-clean-local:
- rm -rf $(CLEANDIRS)
-
-CROSS_OPTIONS_PL = $(top_srcdir)/build-aux/cross-options.pl
-$(srcdir)/cross-options.texi: $(top_srcdir)/src/getargs.c $(CROSS_OPTIONS_PL)
- -rm -f $@ address@hidden
- cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) bison
- $(top_builddir)/src/bison --help | perl $(CROSS_OPTIONS_PL)
>address@hidden
- mv address@hidden $@
-MAINTAINERCLEANFILES = $(srcdir)/cross-options.texi
-
-## ---------- ##
-## Ref card. ##
-## ---------- ##
-
-EXTRA_DIST = refcard.tex
-CLEANFILES += refcard.dvi refcard.log refcard.ps
-
-refcard.dvi: refcard.tex
- tex refcard.tex
-
-refcard.ps: refcard.dvi
-
-
-## ----------- ##
-## Man Pages. ##
-## ----------- ##
-
-dist_man_MANS = $(srcdir)/bison.1
-
-EXTRA_DIST += $(dist_man_MANS:.1=.x) common.x
-MAINTAINERCLEANFILES += $(dist_man_MANS)
-
-# Depend on configure to get version number changes.
-common_dep = $(top_srcdir)/configure $(srcdir)/common.x
-$(srcdir)/bison.1: $(common_dep) $(top_srcdir)/src/getargs.c
-
-# Differences to ignore when comparing the man page (the date).
-remove_time_stamp = \
- sed 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/'
-
-MOSTLYCLEANFILES = $(srcdir)/*.t
-
-SUFFIXES = .x .1
-
-PREPATH = src
-.x.1:
- @program=`expr "/$*" : '.*/\(.*\)'` && \
- save_IFS=$IFS; \
- IFS=$(PATH_SEPARATOR); \
- for dir in $(PREPATH); do \
- IFS=$save_IFS; \
- echo cd $(top_builddir) '&&' \
- $(MAKE) $(AM_MAKEFLAGS) $$dir/$$program && \
- (cd $(top_builddir) && \
- $(MAKE) $(AM_MAKEFLAGS) $$dir/$$program) || exit; \
- done
- @echo "Updating man page $@"
- PATH="$(top_builddir)/$(PREPATH)$(PATH_SEPARATOR)$$PATH"; \
- export PATH; \
- $(HELP2MAN) \
- --include=$*.x \
- --include=$(srcdir)/common.x \
- address@hidden `echo '$*' | sed 's,.*/,,'`
- if $(remove_time_stamp) $@ >address@hidden 2>/dev/null &&
\
- $(remove_time_stamp) address@hidden | cmp address@hidden -
>/dev/null 2>&1; then \
- touch $@; \
- else \
- mv address@hidden $@;
\
- fi
- rm -f address@hidden
-
-nodist_man_MANS = yacc.1
-
-## -------------- ##
-## Doxygenation. ##
-## -------------- ##
-
-DOXYGEN = doxygen
-
-.PHONY: doc html
-
-doc: html
-
-html-local: Doxyfile
- $(DOXYGEN)
-
-edit = sed -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
- -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
- -e 's,@top_builddir\@,$(top_builddir),g' \
- -e 's,@top_srcdir\@,$(top_srcdir),g'
-
-EXTRA_DIST += Doxyfile.in
-CLEANFILES += Doxyfile
-# Sed is used to generate Doxyfile from Doxyfile.in instead of
-# configure, because the former is way faster than the latter.
-Doxyfile: $(srcdir)/Doxyfile.in
- $(edit) $(srcdir)/Doxyfile.in >Doxyfile
-
-CLEANDIRS += html latex
diff --git a/doc/local.mk b/doc/local.mk
new file mode 100644
index 0000000..15a232f
--- /dev/null
+++ b/doc/local.mk
@@ -0,0 +1,125 @@
+## Process this file with automake to produce Makefile.in -*-Makefile-*-
+## Copyright (C) 2001, 2002, 2003, 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/>.
+
+AM_MAKEINFOFLAGS = --no-split
+info_TEXINFOS = doc/bison.texinfo
+doc_bison_TEXINFOS = \
+ $(CROSS_OPTIONS_TEXI) \
+ doc/fdl.texi \
+ doc/gpl-3.0.texi
+
+CLEANFILES = doc/bison.fns
+CLEANDIRS = doc/*.t2d
+clean-local:
+ rm -rf $(CLEANDIRS)
+
+CROSS_OPTIONS_PL = $(top_srcdir)/build-aux/cross-options.pl
+CROSS_OPTIONS_TEXI = $(top_srcdir)/doc/cross-options.texi
+$(CROSS_OPTIONS_TEXI): $(top_srcdir)/src/getargs.c $(CROSS_OPTIONS_PL)
+ -rm -f $@ address@hidden
+ $(MAKE) $(AM_MAKEFLAGS) src/bison
+ $(top_builddir)/src/bison --help | perl $(CROSS_OPTIONS_PL)
>address@hidden
+ mv address@hidden $@
+MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI)
+
+## ---------- ##
+## Ref card. ##
+## ---------- ##
+
+EXTRA_DIST += doc/refcard.tex
+CLEANFILES += doc/refcard.dvi doc/refcard.log doc/refcard.ps
+
+doc/refcard.dvi: doc/refcard.tex
+ cd doc && tex refcard.tex
+
+doc/refcard.ps: doc/refcard.dvi
+
+
+## ----------- ##
+## Man Pages. ##
+## ----------- ##
+
+dist_man_MANS = $(top_srcdir)/doc/bison.1
+
+EXTRA_DIST += $(dist_man_MANS:.1=.x) doc/common.x
+MAINTAINERCLEANFILES += $(dist_man_MANS)
+
+# Depend on configure to get version number changes.
+common_dep = $(top_srcdir)/configure $(top_srcdir)/doc/common.x
+$(top_srcdir)/doc/bison.1: $(common_dep) $(top_srcdir)/src/getargs.c
+
+# Differences to ignore when comparing the man page (the date).
+remove_time_stamp = \
+ sed 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/'
+
+MOSTLYCLEANFILES += $(top_srcdir)/doc/*.t
+
+SUFFIXES = .x .1
+
+PREPATH = src
+.x.1:
+ @program=`expr "/$*" : '.*/\(.*\)'` && \
+ save_IFS=$IFS; \
+ IFS=$(PATH_SEPARATOR); \
+ for dir in $(PREPATH); do \
+ IFS=$save_IFS; \
+ echo $(MAKE) $(AM_MAKEFLAGS) $$dir/$$program; \
+ $(MAKE) $(AM_MAKEFLAGS) $$dir/$$program || exit; \
+ done
+ @echo "Updating man page $@"
+ PATH="$(top_builddir)/$(PREPATH)$(PATH_SEPARATOR)$$PATH"; \
+ export PATH; \
+ $(HELP2MAN) \
+ --include=$*.x \
+ --include=$(top_srcdir)/doc/common.x \
+ address@hidden `echo '$*' | sed 's,.*/,,'`
+ if $(remove_time_stamp) $@ >address@hidden 2>/dev/null &&
\
+ $(remove_time_stamp) address@hidden | cmp address@hidden -
>/dev/null 2>&1; then \
+ touch $@; \
+ else \
+ mv address@hidden $@;
\
+ fi
+ rm -f address@hidden
+
+nodist_man_MANS = doc/yacc.1
+
+## -------------- ##
+## Doxygenation. ##
+## -------------- ##
+
+DOXYGEN = doxygen
+
+.PHONY: doc html
+
+doc: html
+
+html-local: doc/Doxyfile
+ cd doc && $(DOXYGEN)
+
+edit = sed -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+ -e 's,@top_builddir\@,$(top_builddir),g' \
+ -e 's,@top_srcdir\@,$(top_srcdir),g'
+
+EXTRA_DIST += doc/Doxyfile.in
+CLEANFILES += doc/Doxyfile
+# Sed is used to generate Doxyfile from Doxyfile.in instead of
+# configure, because the former is way faster than the latter.
+doc/Doxyfile: $(top_srcdir)/doc/Doxyfile.in
+ $(edit) $(top_srcdir)/doc/Doxyfile.in >doc/Doxyfile
+
+CLEANDIRS += html latex
diff --git a/src/local.mk b/src/local.mk
index 29c19c1..a19d70a 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -110,7 +110,7 @@ BUILT_SOURCES += \
src/scan-gram.c \
src/scan-skel.c
-MOSTLYCLEANFILES = src/yacc
+MOSTLYCLEANFILES += src/yacc
src/yacc:
rm -f $@ address@hidden
--
1.6.0.2.588.g3102
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] Remove doc/Makefile.am.,
Akim Demaille <=