[groff] 32/35: font/devpdf/devpdf.am: Refactor to simplify.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 7891e54facaa89c932a11709240cde4dd060b118
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Jul 14 05:33:49 2022 -0500

    font/devpdf/devpdf.am: Refactor to simplify.
    
    * font/devpdf/devpdf.am: Refactor to simplify.  Now that symbol.map
      lives in the "devpdf/generate" directory along with the other map
      files, it doesn't need a dedicated Makefile target to produce it.
    
      (DEVPDFFONTMAP_1, DEVPDFFONTMAP_2): Coalesce and rename to...
      (devpdffontmapdata): ...this.
    
      (font/devpdf/map/symbol.map:): Drop target.
    
      (devpdffontmap_DATA, font/devpdf/download): Update dependencies.
---
 ChangeLog             | 11 +++++++++++
 font/devpdf/devpdf.am | 17 ++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9dabfc1f..dc42fbb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-07-14  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * font/devpdf/devpdf.am: Refactor to simplify.  Now that
+       symbol.map lives in the "devpdf/generate" directory along with
+       the other map files, it doesn't need a dedicated Makefile target
+       to produce it.
+       (DEVPDFFONTMAP_1, DEVPDFFONTMAP_2): Coalesce and rename to...
+       (devpdffontmapdata): ...this.
+       (font/devpdf/map/symbol.map:): Drop target.
+       (devpdffontmap_DATA, font/devpdf/download): Update dependencies.
+
 2022-07-13  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * font/devpdf/util/BuildFoundries.pl (LoadFoundry): Recast
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index 26cc5819..b2eecfac 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -39,12 +39,12 @@ devpdffontencdir = $(devpdffontdir)/enc
 devpdffontenc_DATA = font/devpdf/enc/text.enc
 
 devpdffontmapdir = $(devpdffontdir)/map
-DEVPDFFONTMAP_1 = \
+devpdffontmapdata = \
   font/devpdf/map/dingbats.map \
+  font/devpdf/map/symbol.map \
   font/devpdf/map/symbolchars \
   font/devpdf/map/text.map
-DEVPDFFONTMAP_2 = font/devpdf/map/symbol.map
-devpdffontmap_DATA = $(DEVPDFFONTMAP_1) $(DEVPDFFONTMAP_2)
+devpdffontmap_DATA = $(devpdffontmapdata)
 
 EXTRA_DIST += \
   font/devpdf/DESC.in \
@@ -58,12 +58,7 @@ font/devpdf/enc/text.enc:
        $(AM_V_at)cp -f $(top_srcdir)/font/devps/text.enc \
          $(top_builddir)/font/devpdf/enc
 
-font/devpdf/map/symbol.map:
-       $(AM_V_at)$(MKDIR_P) $(top_builddir)/font/devpdf/map
-       $(AM_V_at)cp -f $(top_srcdir)/font/devps/generate/symbol.map \
-         $(top_builddir)/font/devpdf/map
-
-$(DEVPDFFONTMAP_1):
+$(devpdffontmapdata):
        $(AM_V_at)$(MKDIR_P) $(top_builddir)/font/devpdf/map
        $(AM_V_at)cp -f \
          $(top_srcdir)/font/devps/generate/`basename $@` \
@@ -111,8 +106,8 @@ else
          $(devpdf_srcdir)/Foundry.in >$@
 endif
 
-font/devpdf/download: $(DEVPDFFONTMAP_1) $(DEVPDFFONTMAP_2) \
-  font/devpdf/DESC font/devpdf/Foundry font/devpdf/enc/text.enc \
+font/devpdf/download: $(devpdffontmapdata) font/devpdf/DESC \
+  font/devpdf/Foundry font/devpdf/enc/text.enc \
   font/devpdf/util/BuildFoundries
        $(AM_V_GEN)$(MKDIR_P) $(top_builddir)/font/devpdf \
        && echo "# foundry      ps-name psfile" >$@.tmp \