diff options
| author | G. Branden Robinson <g.branden.robinson@gmail.com> | 2022-07-14 05:33:49 -0500 |
|---|---|---|
| committer | G. Branden Robinson <g.branden.robinson@gmail.com> | 2022-07-15 21:02:12 -0500 |
| commit | 7891e54facaa89c932a11709240cde4dd060b118 (patch) | |
| tree | 7e3dad3b94d96eea0d1e90b50514fa4afa107129 /font | |
| parent | 5ee1e5893477273584aba3c4e25cea77c0f2d5d8 (diff) | |
| download | groff-git-7891e54facaa89c932a11709240cde4dd060b118.tar.gz | |
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.
Diffstat (limited to 'font')
| -rw-r--r-- | font/devpdf/devpdf.am | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am index 26cc58195..b2eecfac0 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 \ |