[groff] 24/33: - Added contrib/gideal - cleaned dependencies of uninstall-hook targets - Added a missing comment in TESTS on 'make check'

[Bertrand Garrigues]

bgarrigues pushed a commit to branch automake2
in repository groff.

commit 49076c196adde513a2891cddb081855e647c4b88
Author: Bertrand Garrigues <address@hidden>
Date:   Sat Sep 6 16:04:25 2014 +0200

    - Added contrib/gideal
    - cleaned dependencies of uninstall-hook targets
    - Added a missing comment in TESTS on 'make check'
---
 Makefile.am                 |    3 +-
 TESTS                       |   19 ++++++++-
 contrib/gideal/Makefile.sub |   95 -------------------------------------------
 contrib/gideal/gideal.am    |   79 +++++++++++++++++++++++++++++++++++
 font/devpdf/devpdf.am       |    2 +-
 tmac/tmac.am                |    2 +-
 6 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 818476e..c7a6de5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -535,6 +535,7 @@ include $(top_srcdir)/arch/misc/misc.am
 include $(top_srcdir)/contrib/chem/chem.am
 include $(top_srcdir)/contrib/eqn2graph/eqn2graph.am
 include $(top_srcdir)/contrib/gdiffmk/gdiffmk.am
+include $(top_srcdir)/contrib/gideal/gideal.am
 include $(top_srcdir)/font/devX100/devX100.am
 include $(top_srcdir)/font/devX100-12/devX100-12.am
 include $(top_srcdir)/font/devX75/devX75.am
@@ -603,7 +604,7 @@ lib/localcharset.$(OBJEXT): lib/configmake.h
 
 # directories specific to groff
 uninstall-hook: uninstall_groffdirs
-uninstall_groffdirs: uninstall_devpdf uninstall_tmac_hook
+uninstall_groffdirs:
        if test -d $(DESTDIR)$(datasubdir); then \
          rm -rf $(DESTDIR)$(fontdir); \
          rm -rf $(DESTDIR)$(oldfontdir); \
diff --git a/TESTS b/TESTS
index 4ea8741..d118fe3 100644
--- a/TESTS
+++ b/TESTS
@@ -24,6 +24,7 @@ Current status
     -- chem
     -- eqn2graph
     -- gdiffmk
+    -- gideal
 
 Tests
 -----
@@ -143,9 +144,12 @@ from contrib/chem:
 from contrib/eqn2graph:
   - `eqn2graph' script
 
-from contrin/gdiffmk:
+from contrib/gdiffmk:
   - `gdiffmk' script
 
+from contrib/gideal
+  - `gideal' script
+
 In order to check and improve the dependencies, the following targets
 were built from a clean environment:
   - make lib/libgnu.a
@@ -186,6 +190,7 @@ were built from a clean environment:
   - make chem
   - make eqn2graph
   - make gdiffmk
+  - make gideal
 
 2.2 make clean
 
@@ -280,6 +285,7 @@ Differences with former build system:
     -- chem
     -- eqn2graph
     -- gdiffmk
+    -- gideal
 
   - contrib/chem:
 
@@ -292,7 +298,15 @@ Differences with former build system:
     
     -- contrib/chem/README is strangely build but not installed, this
        is the behaviour on the old build system.
-    
+
+  - contrib/gideal:
+     
+    -- .ideal files installed in
+       $(DESTDIR)/usr/local/share/groff/1.22.2/ideal/libfiles/
+
+    -- example files installed in
+       $(DESTDIR)/usr/local/share/doc/groff-1.22.2/examples/ideal/files/
+
 Diff with previous build system:
   - devcp1047 fonts are installed $(DESTDIR)/usr/local/groff/1.22.2/font
 
@@ -381,6 +395,7 @@ TODO:
 
 2.9 make check
   
+  (manually called automake --add-missing to add build-aux/test-driver)
   - gdiffmk's test script is now plugged to the 'make check'
     target. The original runtests.in is renamed to runtests.sh with
     absolute paths. The new script gdiffmk_tests.sh is used to call
diff --git a/contrib/gideal/Makefile.sub b/contrib/gideal/Makefile.sub
deleted file mode 100644
index b59a757..0000000
--- a/contrib/gideal/Makefile.sub
+++ /dev/null
@@ -1,95 +0,0 @@
-# Makefile.sub for `gideal' (preprocessor for added Perl parts)
-
-# File position: <groff-source>/contrib/gideal/Makefile.sub
-
-# Copyright (C) 2014
-#   Free Software Foundation, Inc.
-# Written by Bernd Warken <address@hidden>.
-
-# Last update: 17 Jun 2014
-
-# This file is part of `gideal' which 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 2 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/gpl-2.0.html>.
-
-########################################################################
-
-MAN1=gideal.n
-
-MAN7=ideal.n
-
-MOSTLYCLEANADD=gideal $(MAN1) $(MAN7)
-
-# not all make programs have $(RM) predefined.
-RM=rm -f
-
-all: gideal
-
-gideal: gideal.pl
-       sed -f "$(SH_DEPS_SED_SCRIPT)" \
-            -e "s|@g@|$(g)|g" \
-           -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
-           -e "s|@VERSION@|$(version)$(revision)|g" \
-           -e "$(SH_SCRIPT_SED_CMD)" \
-           $(srcdir)/gideal.pl >$@; \
-       chmod +x $@
-
-.PHONY: install_data
-install_data: gideal
-       -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-       $(RM) $(DESTDIR)$(bindir)/gideal
-       $(INSTALL_SCRIPT) gideal $(DESTDIR)$(bindir)/gideal
-       -test -d $(DESTDIR)$(datasubdir) \
-          || $(mkinstalldirs) $(DESTDIR)$(datasubdir)
-       -test -d $(DESTDIR)$(datasubdir)/ideal \
-          || $(mkinstalldirs) $(DESTDIR)$(datasubdir)/ideal
-       -test -d $(DESTDIR)$(datasubdir)/ideal/libfiles \
-          || $(mkinstalldirs) $(DESTDIR)$(datasubdir)/ideal/libfiles
-       $(RM) $(DESTDIR)$(datasubdir)/ideal/libfiles/*
-       for i in $(srcdir)/libfiles/*; do \
-         n=`echo $$i | sed 's|$(srcdir)/libfiles/||g'`; \
-         $(INSTALL_DATA) $$i $(DESTDIR)$(datasubdir)/ideal/libfiles/$$n; \
-       done
-       -test -d $(DESTDIR)$(exampledir) \
-          || $(mkinstalldirs) $(DESTDIR)$(exampledir)
-       -test -d $(DESTDIR)$(exampledir)/ideal \
-          || $(mkinstalldirs) $(DESTDIR)$(exampledir)/ideal
-       -test -d $(DESTDIR)$(exampledir)/ideal/files \
-          || $(mkinstalldirs) $(DESTDIR)$(exampledir)/ideal/files
-       $(RM) $(DESTDIR)$(exampledir)/ideal/files/*
-       for i in $(srcdir)/files/*; do \
-         n=`echo $$i | sed 's|$(srcdir)/files/||g'`; \
-         $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/ideal/files/$$n; \
-       done
-
-
-.PHONY: uninstall_sub
-uninstall_sub:
-       $(RM) $(DESTDIR)$(bindir)/gideal
-       -rmdir $(DESTDIR)$(bindir)
-       $(RM) $(DESTDIR)$(datasubdir)/ideal/files/*
-       -rmdir $(DESTDIR)$(datasubdir)/ideal/files
-       $(RM) $(DESTDIR)$(datasubdir)/ideal/libfiles/*
-       -rmdir $(DESTDIR)$(datasubdir)/ideal/libfiles
-       -rmdir $(DESTDIR)$(datasubdir)/ideal
-
-
-########################################################################
-# Emacs settings
-########################################################################
-#
-# Local Variables:
-# mode: makefile
-# End:
diff --git a/contrib/gideal/gideal.am b/contrib/gideal/gideal.am
new file mode 100644
index 0000000..354b49f
--- /dev/null
+++ b/contrib/gideal/gideal.am
@@ -0,0 +1,79 @@
+# Automake rules for `gideal' (preprocessor for added Perl parts)
+
+# File position: <groff-source>/contrib/gideal/gideal.am
+
+# Copyright (C) 2014
+#   Free Software Foundation, Inc.
+# Written by Bernd Warken <address@hidden>.
+# Automake migration by Bertrand Garrigues
+
+# Last update: Aug 2014
+
+# This file is part of `gideal' which 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 2 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/gpl-2.0.html>.
+
+########################################################################
+gideal_srcdir = $(top_srcdir)/contrib/gideal
+bin_SCRIPTS += gideal
+man1_MANS += contrib/gideal/gideal.n
+man7_MANS += contrib/gideal/ideal.n
+MOSTLYCLEANFILES += gideal
+
+gideallibfilesdir = $(datasubdir)/ideal/libfiles
+dist_gideallibfiles_DATA = \
+  contrib/gideal/libfiles/README.txt  \
+  contrib/gideal/libfiles/arc.ideal \
+  contrib/gideal/libfiles/arrow.ideal \
+  contrib/gideal/libfiles/circle.ideal \
+  contrib/gideal/libfiles/dash.ideal \
+  contrib/gideal/libfiles/rect.ideal \
+  contrib/gideal/libfiles/wavy.ideal
+
+gidealfilesdir = $(exampledir)/ideal/files
+dist_gidealfiles_DATA = \
+  contrib/gideal/files/README.txt \
+  contrib/gideal/files/opaque_MIT.ideal.ms \
+  contrib/gideal/files/test.groff
+
+EXTRA_DIST += \
+  contrib/gideal/ChangeLog \
+  contrib/gideal/gideal.man \
+  contrib/gideal/gideal.pl \
+  contrib/gideal/ideal.man
+
+gideal: contrib/gideal/gideal.pl
+       sed -f "$(SH_DEPS_SED_SCRIPT)" \
+            -e "s|address@hidden@]|$(g)|g" \
+           -e "s|address@hidden@]|$(DESTDIR)$(bindir)|g" \
+           -e "s|address@hidden@]|$(VERSION)|g" \
+           -e "$(SH_SCRIPT_SED_CMD)" \
+           $(gideal_srcdir)/gideal.pl >$@; \
+       chmod +x $@
+
+uninstall_groffdirs: gideal-uninstall-hook
+gideal-uninstall-hook:
+       if test -d $(DESTDIR)$(datasubdir)/ideal; then \
+         if test -d $(DESTDIR)$(gideallibfilesdir); then \
+           rmdir $(DESTDIR)$(gideallibfilesdir); \
+         fi; \
+         rmdir $(DESTDIR)$(datasubdir)/ideal; \
+       fi
+       if test -d $(DESTDIR)$(exampledir)/ideal; then \
+         if test -d $(DESTDIR)$(gidealfilesdir); then \
+           rmdir $(DESTDIR)$(gidealfilesdir); \
+         fi; \
+         rmdir $(DESTDIR)$(exampledir)/ideal; \
+       fi
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index b37c97f..9039894 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -146,7 +146,7 @@ install_devpdf:
        done
        $(INSTALL_DATA) $(top_builddir)/font/devpdf/download 
$(DESTDIR)$(devpdffontdir)/
 
-uninstall-hook: uninstall_devpdf
+uninstall_groffdirs: uninstall_devpdf
 uninstall_devpdf:
        @echo Uninstalling devpdf files
        if test -d $(DESTDIR)$(devpdffontdir); then \
diff --git a/tmac/tmac.am b/tmac/tmac.am
index e8a6870..80bdba4 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -179,7 +179,7 @@ tmac/www.tmac: tmac/www.tmac.in
        sed -e "s;address@hidden@];$(pnmtops_nosetpage);g" \
          $(tmac_srcdir)/www.tmac.in > $(top_builddir)/tmac/www.tmac
 
-uninstall-hook: uninstall_tmac_hook
+uninstall_groffdirs: uninstall_tmac_hook
 uninstall_tmac_hook:
        -if test -n "$(tmac_wrap)"; then \
          for m in ""$(tmac_wrap); do \