[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 28/45: Add contrib/hdtbl.
From: |
Bertrand Garrigues |
Subject: |
[groff] 28/45: Add contrib/hdtbl. |
Date: |
Mon, 20 Oct 2014 21:39:54 +0000 |
bgarrigues pushed a commit to branch automake3
in repository groff.
commit 2130a97699508e7f98a5176b58565fa83d71471b
Author: Bertrand Garrigues <address@hidden>
Date: Sun Sep 7 12:41:50 2014 +0200
Add contrib/hdtbl.
Build gnu.eps.
---
Makefile.am | 24 ++++-
TESTS | 12 ++-
contrib/hdtbl/Makefile.sub | 172 --------------------------
contrib/hdtbl/{hdmisc.tmac => hdmisc.tmac-u} | 0
contrib/hdtbl/hdtbl.am | 117 +++++++++++++++++
contrib/hdtbl/{hdtbl.tmac => hdtbl.tmac-u} | 0
6 files changed, 151 insertions(+), 174 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 4a368b2..1a6ae86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -513,6 +513,8 @@ man7_MANS =
# for lex/yacc
AM_YFLAGS = -d -v
+SUFFIXES =
+
# tests launched by make check
check_SCRIPTS =
check_PROGRAMS =
@@ -522,6 +524,14 @@ AM_TESTS_ENVIRONMENT = \
abs_top_builddir=$(abs_top_builddir) \
export abs_top_srcdir abs_top_builddir;
+# Path to binaries and flags used by contribs and doc to generated doc.
+# These may be overridden if cross-compiling.
+GROFFBIN = $(abs_top_builddir)/groff
+GROFF_BIN_PATH = $(abs_top_builddir)
+PDFMOMBIN = $(abs_top_builddir)/pdfmom
+FFLAG=-F$(abs_top_builddir)/font -F$(abs_top_srcdir)/font
+TFLAG=-M$(abs_top_builddir)/tmac -M$(abs_top_srcdir)/tmac
+
# Non-recursive makefile system. See Automake manual '7.3 An
# Alternative Approach to Subdirectories'. We use a single Makefile.am
# that includes other .am files, rather than using SUBDIRS. Note that
@@ -539,6 +549,7 @@ include $(top_srcdir)/contrib/gpinyin/gpinyin.am
include $(top_srcdir)/contrib/grap2graph/grap2graph.am
include $(top_srcdir)/contrib/groff_filenames/groff_filenames.am
include $(top_srcdir)/contrib/groffer/groffer.am
+include $(top_srcdir)/contrib/hdtbl/hdtbl.am
include $(top_srcdir)/contrib/pic2graph/pic2graph.am
include $(top_srcdir)/font/devX100/devX100.am
include $(top_srcdir)/font/devX100-12/devX100-12.am
@@ -606,6 +617,17 @@ BUILT_SOURCES += defs.h
# possible
lib/localcharset.$(OBJEXT): lib/configmake.h
+# File used by contrib/hdtbl and contrib/pdfmark
+gnu.eps:
+ if test -f $(top_srcdir)/doc/gnu.eps; then \
+ cp $(top_srcdir)/doc/gnu.eps . ; \
+ elif test -f $(top_builddir)/doc/gnu.eps; then \
+ cp $(top_builddir)/doc/gnu.eps . ; \
+ else \
+ xpmtoppm $(top_srcdir)/doc/gnu.xpm | pnmdepth 15 \
+ | $(pnmtops_nosetpage) -noturn -rle >$@ ; \
+ fi
+
# directories specific to groff
uninstall-hook: uninstall_groffdirs
uninstall_groffdirs:
@@ -655,7 +677,7 @@ EXTRA_DIST += \
README.MinGW \
arch/djgpp
-MOSTLYCLEANFILES += $(man1_MANS) $(man5_MANS) $(man7_MANS) $(bin_SCRIPTS)
+MOSTLYCLEANFILES += $(man1_MANS) $(man5_MANS) $(man7_MANS) $(bin_SCRIPTS)
gnu.eps
# Rule to build .man files. The brackets around the @ are used to prevent the
# substitution of the variable by automake.
diff --git a/TESTS b/TESTS
index 8353086..d2c651b 100644
--- a/TESTS
+++ b/TESTS
@@ -22,7 +22,6 @@ Current status
- tmac files from 'tmac' directory installed
- Build and installation of contrib, except:
-- mm
- -- hdtbl
-- pdfmark
-- mom
@@ -165,6 +164,9 @@ from contrib/glilypond
from contrib/groffer
- `groffer' script, all the man files.
+from contrib/hdtbl
+ - hdtbl examples and tmac files
+
In order to check and improve the dependencies, the following targets
were built from a clean environment:
- make lib/libgnu.a
@@ -318,6 +320,14 @@ Differences with former build system:
-- contrib/chem/README is strangely build but not installed, this
is the behaviour on the old build system.
+ - contrib/hdtbl:
+
+ -- example files in
+ $(DESTDIR)/usr/local/share/doc/groff-1.22.3/examples/hdtbl
+
+ -- hdtbl.tmac and hdmisc.tmac installed in
+ $(DESTDIR)/usr/local/share/groff-1.22.3/tmac
+
Diff with previous build system:
- devcp1047 fonts are installed $(DESTDIR)/usr/local/groff/1.22.3/font
diff --git a/contrib/hdtbl/Makefile.sub b/contrib/hdtbl/Makefile.sub
deleted file mode 100644
index 5bc06d8..0000000
--- a/contrib/hdtbl/Makefile.sub
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
-# Written by Werner Lemberg (address@hidden)
-#
-# This file is part of groff.
-#
-# groff 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.
-#
-# groff 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/>.
-
-# These may be overridden if cross-compiling.
-GROFFBIN=$(top_builddir)/src/roff/groff/groff
-GROFF_BIN_PATH=`echo $(groff_bin_dirs) | sed -e 's| *|$(SH_SEP)|g'`
-
-groff_bin_dirs=\
- $(top_builddir)/src/roff/groff \
- $(top_builddir)/src/roff/troff \
- $(top_builddir)/src/preproc/eqn \
- $(top_builddir)/src/preproc/pic \
- $(top_builddir)/src/preproc/tbl \
- $(top_builddir)/src/devices/grops
-
-FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font
-TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac -M$(srcdir)
-PFLAG=-t -p -e -U
-
-GROFF=\
- GROFF_COMMAND_PREFIX= \
- GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
- $(GROFFBIN) $(FFLAG) $(TFLAG) $(PFLAG)
-
-MAN7=\
- groff_hdtbl.n
-
-# These files are processed with `strip.sed'.
-STRIPFILES=\
- hdtbl.tmac \
- hdmisc.tmac
-
-# These files are handled by the `.in.roff' rule.
-GENFILES=\
- examples/fonts_n.roff \
- examples/fonts_x.roff
-
-EXAMPLEFILES=\
- examples/common.roff \
- examples/chess_board.roff \
- examples/color_boxes.roff \
- examples/color_nested_tables.roff \
- examples/color_table_cells.roff \
- examples/color_transitions.roff \
- examples/col_rowspan_colors.roff \
- examples/mixed_pickles.roff \
- examples/rainbow.roff \
- examples/short_reference.roff
-
-PROCESSEDEXAMPLEFILES=\
- examples/chess_board.ps \
- examples/color_boxes.ps \
- examples/color_nested_tables.ps \
- examples/color_table_cells.ps \
- examples/color_transitions.ps \
- examples/col_rowspan_colors.ps \
- examples/fonts_n.ps \
- examples/fonts_x.ps \
- examples/mixed_pickles.ps \
- examples/rainbow.ps \
- examples/short_reference.ps
-
-EXAMPLEFILES_=`echo $(EXAMPLEFILES) | sed 's|examples/||g'`
-GENFILES_=`echo $(GENFILES) | sed 's|examples/||g'`
-PROCESSEDEXAMPLEFILES_=`echo $(PROCESSEDEXAMPLEFILES) | sed 's|examples/||g'`
-
-MOSTLYCLEANADD=\
- gnu.eps \
- $(PROCESSEDEXAMPLEFILES) \
- $(GENFILES) \
- examples/stamp \
- stamp-strip \
- hdmisc.tmac-s hdtbl.tmac-s
-
-RM=rm -f
-
-.SUFFIXES: .roff .in .ps
-
-.roff.ps:
- $(GROFF) -Tps -dfontpath=$(top_srcdir)/font -dsopath=$(srcdir)/ \
- -mhdtbl $< >$@
-
-.in.roff:
- sed -e "s|@fontdir@|$(fontdir)|" $< >$@
-
-all: $(make_examples) stamp-strip
-
-.PHONY: examples
-examples: $(PROCESSEDEXAMPLEFILES)
-
-$(PROCESSEDEXAMPLEFILES): gnu.eps examples/stamp examples/common.roff
-
-gnu.eps:
- if test -f $(top_srcdir)/doc/gnu.eps; then \
- cp $(top_srcdir)/doc/gnu.eps . ; \
- elif test -f $(top_builddir)/doc/gnu.eps; then \
- cp $(top_builddir)/doc/gnu.eps . ; \
- else \
- xpmtoppm $(top_srcdir)/doc/gnu.xpm | pnmdepth 15 \
- | $(pnmtops_nosetpage) -noturn -rle >$@ ; \
- fi
-
-examples/stamp:
- -test -d examples || $(mkinstalldirs) examples
- touch $@
-
-stamp-strip: $(STRIPFILES)
- for f in $(STRIPFILES); do \
- $(RM) $$f-s; \
- sed -f $(top_srcdir)/tmac/strip.sed $(srcdir)/$$f >$$f-s; \
- done
- touch $@
-
-install_data: install_always $(make_install_examples)
-
-install_always: $(STRIPFILES) $(GENFILES)
- -test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
- for f in $(STRIPFILES); do \
- $(RM) $(DESTDIR)$(tmacdir)/$$f; \
- $(INSTALL_DATA) $$f-s $(DESTDIR)$(tmacdir)/$$f; \
- done
-
-install_examples: install_always $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES) \
- gnu.eps stamp-strip
- -test -d $(DESTDIR)$(exampledir)/hdtbl \
- || $(mkinstalldirs) $(DESTDIR)$(exampledir)/hdtbl
- for f in $(EXAMPLEFILES_); do \
- $(RM) $(DESTDIR)$(exampledir)/hdtbl/$$f; \
- $(INSTALL_DATA) $(srcdir)/examples/$$f \
- $(DESTDIR)$(exampledir)/hdtbl/$$f; \
- done
- for f in $(PROCESSEDEXAMPLEFILES_) $(GENFILES_); do \
- $(RM) $(DESTDIR)$(exampledir)/hdtbl/$$f; \
- $(INSTALL_DATA) examples/$$f $(DESTDIR)$(exampledir)/hdtbl/$$f; \
- done
- $(INSTALL_DATA) gnu.eps $(DESTDIR)$(exampledir)/hdtbl/gnu.eps
-
-uninstall_sub: uninstall_always $(make_uninstall_examples)
-
-uninstall_always:
- -for f in $(STRIPFILES); do $(RM) $(DESTDIR)$(tmacdir)/$$f; done
-
-uninstall_examples: uninstall_always
- -for f in $(EXAMPLEFILES_) $(PROCESSEDEXAMPLEFILES_) $(GENFILES_); do \
- $(RM) $(DESTDIR)$(exampledir)/hdtbl/$$f; \
- done
- $(RM) $(DESTDIR)$(exampledir)/hdtbl/gnu.eps
- -test -d $(DESTDIR)$(exampledir)/hdtbl && \
- rmdir $(DESTDIR)$(exampledir)/hdtbl
-
-########################################################################
-# Emacs settings
-########################################################################
-#
-# Local Variables:
-# mode: makefile
-# End:
diff --git a/contrib/hdtbl/hdmisc.tmac b/contrib/hdtbl/hdmisc.tmac-u
similarity index 100%
rename from contrib/hdtbl/hdmisc.tmac
rename to contrib/hdtbl/hdmisc.tmac-u
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
new file mode 100644
index 0000000..234d140
--- /dev/null
+++ b/contrib/hdtbl/hdtbl.am
@@ -0,0 +1,117 @@
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Written by Werner Lemberg (address@hidden)
+# Automake migration by Bertrand Garrigues
+#
+# This file is part of groff.
+#
+# groff 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.
+#
+# groff 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/>.
+
+hdtbl_srcdir = $(top_srcdir)/contrib/hdtbl
+hdtbl_builddir = $(top_builddir)/contrib/hdtbl
+
+man7_MANS += contrib/hdtbl/groff_hdtbl.n
+
+# Groff command used to generate .ps files
+HDTBL_TFLAG = -M$(hdtbl_srcdir) -M$(hdtbl_builddir)
+HDTLB_PFLAG=-t -p -e -U
+HDTBLGROFF = \
+ GROFF_COMMAND_PREFIX= \
+ GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
+ $(GROFFBIN) $(FFLAG) $(TFLAG) $(HDTBL_TFLAG) $(HDTLB_PFLAG)
+
+# Files installed in $(tmacdir).
+# These files are generated with `strip.sed' from their unstripped source file
+# equivalent (e.g. hdtbl.tmac is generated from hdtbl.tmac-u)
+HDTBLSTRIPFILES = \
+ contrib/hdtbl/hdtbl.tmac \
+ contrib/hdtbl/hdmisc.tmac
+hdtbltmacdir = $(tmacdir)
+hdtbltmac_DATA = $(HDTBLSTRIPFILES)
+
+# Files installed in $(exampledir)/hdtbl. HDTBLEXAMPLEFILES are
+# located in the source tree, while HDTBLPROCESSEDEXAMPLEFILES are
+# generated in the build tree.
+
+# These files are handled by the `.in.roff' rule.
+HDTBLGENFILES = \
+ contrib/hdtbl/examples/fonts_n.roff \
+ contrib/hdtbl/examples/fonts_x.roff
+
+HDTBLEXAMPLEFILES = \
+ contrib/hdtbl/examples/common.roff \
+ contrib/hdtbl/examples/chess_board.roff \
+ contrib/hdtbl/examples/color_boxes.roff \
+ contrib/hdtbl/examples/color_nested_tables.roff \
+ contrib/hdtbl/examples/color_table_cells.roff \
+ contrib/hdtbl/examples/color_transitions.roff \
+ contrib/hdtbl/examples/col_rowspan_colors.roff \
+ contrib/hdtbl/examples/mixed_pickles.roff \
+ contrib/hdtbl/examples/rainbow.roff \
+ contrib/hdtbl/examples/short_reference.roff
+
+HDTBLPROCESSEDEXAMPLEFILES = \
+ contrib/hdtbl/examples/chess_board.ps \
+ contrib/hdtbl/examples/color_boxes.ps \
+ contrib/hdtbl/examples/color_nested_tables.ps \
+ contrib/hdtbl/examples/color_table_cells.ps \
+ contrib/hdtbl/examples/color_transitions.ps \
+ contrib/hdtbl/examples/col_rowspan_colors.ps \
+ contrib/hdtbl/examples/fonts_n.ps \
+ contrib/hdtbl/examples/fonts_x.ps \
+ contrib/hdtbl/examples/mixed_pickles.ps \
+ contrib/hdtbl/examples/rainbow.ps \
+ contrib/hdtbl/examples/short_reference.ps
+
+hdtblexampledir = $(exampledir)/hdtbl
+dist_hdtblexample_DATA = $(HDTBLEXAMPLEFILES)
+nodist_hdtblexample_DATA = $(HDTBLGENFILES)
+nodist_hdtblexample_DATA += $(HDTBLPROCESSEDEXAMPLEFILES) gnu.eps
+$(hdtblexample_DATA): $(HDTBLSTRIPFILES)
+
+MOSTLYCLEANFILES += $(HDTBLGENFILES) $(HDTBLPROCESSEDEXAMPLEFILES) \
+ hdmisc.tmac-s hdtbl.tmac-s $(HDTBLSTRIPFILES)
+
+EXTRA_DIST += \
+ contrib/hdtbl/ChangeLog \
+ contrib/hdtbl/TODO \
+ contrib/hdtbl/groff_hdtbl.man \
+ contrib/hdtbl/hdtbl.tmac-u \
+ contrib/hdtbl/hdmisc.tmac-u \
+ contrib/hdtbl/examples \
+ $(HDTBLEXAMPLEFILES)
+
+# Rule to generate ps and roff files
+SUFFIXES += .roff .in .ps
+
+.roff.ps:
+ @$(MKDIR_P) `dirname address@hidden
+ $(HDTBLGROFF) -Tps -dfontpath=$(top_srcdir)/font
-dsopath=$(hdtbl_srcdir)/ \
+ -mhdtbl $< >$@
+.in.roff:
+ @$(MKDIR_P) `dirname address@hidden
+ sed -e "s|address@hidden@]|$(fontdir)|" $< >$@
+
+
+$(HDTBLPROCESSEDEXAMPLEFILES): gnu.eps groff troff pic tbl \
+ contrib/hdtbl/examples/common.roff
+
+$(HDTBLSTRIPFILES): $(top_srcdir)/tmac/strip.sed
+ @$(MKDIR_P) `dirname address@hidden
+ sed -f $(top_srcdir)/tmac/strip.sed $(hdtbl_srcdir)/`basename
address@hidden > $@;
+
+uninstall_groffdirs: uninstall-hdtbl-hook
+uninstall-hdtbl-hook:
+ if test -d $(DESTDIR)$(hdtblexampledir); then \
+ rmdir $(DESTDIR)$(hdtblexampledir); \
+ fi
diff --git a/contrib/hdtbl/hdtbl.tmac b/contrib/hdtbl/hdtbl.tmac-u
similarity index 100%
rename from contrib/hdtbl/hdtbl.tmac
rename to contrib/hdtbl/hdtbl.tmac-u
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 28/45: Add contrib/hdtbl.,
Bertrand Garrigues <=