[groff] 22/33: Add contrib/eqn2graph

[Bertrand Garrigues]

bgarrigues pushed a commit to branch automake2
in repository groff.

commit 1d91d034d6ff0062c1f4e3ac13fd833fa93f013b
Author: Bertrand Garrigues <address@hidden>
Date:   Sat Sep 6 13:52:31 2014 +0200

    Add contrib/eqn2graph
---
 Makefile.am                                      |    1 +
 TESTS                                            |   10 ++++---
 contrib/eqn2graph/{Makefile.sub => eqn2graph.am} |   28 +++++++++------------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 05c3e13..862c97c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -524,6 +524,7 @@ AM_YFLAGS = -d -v
 include $(top_srcdir)/lib/gnulib.mk
 include $(top_srcdir)/arch/misc/misc.am
 include $(top_srcdir)/contrib/chem/chem.am
+include $(top_srcdir)/contrib/eqn2graph/eqn2graph.am
 include $(top_srcdir)/font/devX100/devX100.am
 include $(top_srcdir)/font/devX100-12/devX100-12.am
 include $(top_srcdir)/font/devX75/devX75.am
diff --git a/TESTS b/TESTS
index fddcdaf..5cd65f7 100644
--- a/TESTS
+++ b/TESTS
@@ -20,7 +20,7 @@ Current status
   - Build font/*
   - man files from 'man' directory installed
   - tmac files from 'tmac' directory installed
-  - Build and installation of contrib/chem
+  - Build and installation of contrib/chem, contrib/eqn2graph
 
 Tests
 -----
@@ -40,7 +40,7 @@ Generated the following files and directories:
   lib/
   src/include/config.hin
 
-2. Build of various targets
+2. Tests of various targets
 
 Tests done in 2 configurations:
 
@@ -137,6 +137,9 @@ from font: font files in
 from contrib/chem:
   - `chem' script and 3 README files
 
+from contrib/eqn2graph:
+  - `eqn2graph' script
+
 In order to check and improve the dependencies, the following targets
 were built from a clean environment:
   - make lib/libgnu.a
@@ -175,6 +178,7 @@ were built from a clean environment:
   - make nroff
   - make troff
   - make chem
+  - make eqn2graph
 
 2.2 make clean
 
@@ -330,8 +334,6 @@ TODO:
   - Missing files/directories (TODO):
     contrib/
     doc/
-    man/
-    tmac
     test-groff.in
 
   - Files/directories not present in the git tree that are
diff --git a/contrib/eqn2graph/Makefile.sub b/contrib/eqn2graph/eqn2graph.am
similarity index 61%
rename from contrib/eqn2graph/Makefile.sub
rename to contrib/eqn2graph/eqn2graph.am
index ff5e3ae..f3b35f5 100644
--- a/contrib/eqn2graph/Makefile.sub
+++ b/contrib/eqn2graph/eqn2graph.am
@@ -16,23 +16,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-# Makefile.sub
+# eqn2graph.am
 #
-MAN1=eqn2graph.n
-MOSTLYCLEANADD=eqn2graph
+eqn2graph_srcdir = $(top_srcdir)/contrib/eqn2graph
+bin_SCRIPTS += eqn2graph
+man1_MANS += contrib/eqn2graph/eqn2graph.n
+EXTRA_DIST += \
+  contrib/eqn2graph/eqn2graph.man \
+  contrib/eqn2graph/eqn2graph.sh
 
-all: eqn2graph
+MOSTLYCLEANFILES += eqn2graph
 
-eqn2graph: eqn2graph.sh
-       sed -e "s|@g@|$(g)|g" \
-           -e "s|@VERSION@|$(version)$(revision)|" \
-           -e $(SH_SCRIPT_SED_CMD) $(srcdir)/eqn2graph.sh >$@
+eqn2graph: $(top_srcdir)/contrib/eqn2graph/eqn2graph.sh
+       sed -e "s|address@hidden@]|$(g)|g" \
+           -e "s|address@hidden@]|$(VERSION)|" \
+           -e $(SH_SCRIPT_SED_CMD) $(eqn2graph_srcdir)/eqn2graph.sh >$@
        chmod +x $@
-
-install_data: eqn2graph
-       -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-       rm -f $(DESTDIR)$(bindir)/eqn2graph
-       $(INSTALL_SCRIPT) eqn2graph $(DESTDIR)$(bindir)/eqn2graph
-
-uninstall_sub:
-       rm -f $(DESTDIR)$(bindir)/eqn2graph