Revert "[devpdf]: Do more explicit work and less magic."

This reverts commit 254e13c387a7fdd0267fac697737b5862c0851ad.

Per request from Deri James.
https://lists.gnu.org/archive/html/groff-commit/2022-11/msg00093.html

1 files changed, 7 insertions, 97 deletions

diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index 0114d15e0..51e83336e 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -24,90 +24,16 @@ GROFF_FONT_FILES=`cd $(top_builddir)/font/devpdf \
 ENC_FILES=`cd $(top_builddir)/font/devpdf; ls enc/*`
 MAP_FILES=`cd $(top_builddir)/font/devpdf; ls map/*`
 
-DEFAULT_BASE35_FONTS = \
-  font/devpdf/AB \
-  font/devpdf/ABI \
-  font/devpdf/AI \
-  font/devpdf/AR \
-  font/devpdf/BMB \
-  font/devpdf/BMBI \
-  font/devpdf/BMI \
-  font/devpdf/BMR \
-  font/devpdf/CB \
-  font/devpdf/CBI \
-  font/devpdf/CI \
-  font/devpdf/CR \
-  font/devpdf/HB \
-  font/devpdf/HBI \
-  font/devpdf/HI \
-  font/devpdf/HNB \
-  font/devpdf/HNBI \
-  font/devpdf/HNI \
-  font/devpdf/HNR \
-  font/devpdf/HR \
-  font/devpdf/NB \
-  font/devpdf/NBI \
-  font/devpdf/NI \
-  font/devpdf/NR \
-  font/devpdf/PB \
-  font/devpdf/PBI \
-  font/devpdf/PI \
-  font/devpdf/PR \
-  font/devpdf/S \
-  font/devpdf/TB \
-  font/devpdf/TBI \
-  font/devpdf/TI \
-  font/devpdf/TR \
-  font/devpdf/ZCMI \
-  font/devpdf/ZD
-
-devpdffontdir = $(fontdir)/devpdf
-devpdffont_DATA = $(DEFAULT_BASE35_FONTS) \
+MOSTLYCLEANFILES += \
+  font/devpdf/download \
   font/devpdf/DESC \
   font/devpdf/Foundry \
-  font/devpdf/EURO \
-  font/devpdf/freeeuro.afm \
-  font/devpdf/freeeuro.pfa
+  font/devpdf/util/BuildFoundries
 
-if HAVE_URW_FONTS
-URW_BASE35_FONTS = \
-  font/devpdf/U-AB \
-  font/devpdf/U-ABI \
-  font/devpdf/U-AI \
-  font/devpdf/U-AR \
-  font/devpdf/U-BMB \
-  font/devpdf/U-BMBI \
-  font/devpdf/U-BMI \
-  font/devpdf/U-BMR \
-  font/devpdf/U-CB \
-  font/devpdf/U-CBI \
-  font/devpdf/U-CI \
-  font/devpdf/U-CR \
-  font/devpdf/U-HB \
-  font/devpdf/U-HBI \
-  font/devpdf/U-HI \
-  font/devpdf/U-HNB \
-  font/devpdf/U-HNBI \
-  font/devpdf/U-HNI \
-  font/devpdf/U-HNR \
-  font/devpdf/U-HR \
-  font/devpdf/U-NB \
-  font/devpdf/U-NBI \
-  font/devpdf/U-NI \
-  font/devpdf/U-NR \
-  font/devpdf/U-PB \
-  font/devpdf/U-PBI \
-  font/devpdf/U-PI \
-  font/devpdf/U-PR \
-  font/devpdf/U-S \
-  font/devpdf/U-TB \
-  font/devpdf/U-TBI \
-  font/devpdf/U-TI \
-  font/devpdf/U-TR \
-  font/devpdf/U-ZCMI \
-  font/devpdf/U-ZD
-devpdffont_DATA += $(URW_BASE35_FONTS)
-endif
+devpdffontdir = $(fontdir)/devpdf
+devpdffont_DATA = \
+  font/devpdf/DESC \
+  font/devpdf/Foundry
 
 devpdffontencdir = $(devpdffontdir)/enc
 devpdffontenc_DATA = font/devpdf/enc/text.enc
@@ -172,22 +98,6 @@ font/devpdf/DESC: $(devpdf_srcdir)/DESC.in
 	       >>$(top_builddir)/font/devpdf/DESC; \
 	   fi
 
-MOSTLYCLEANFILES += font/devpdf/freeeuro.afm
-font/devpdf/freeeuro.afm: $(devps_srcdir)/freeeuro.afm
-	$(AM_V_GEN)$(MKDIR_P) $(top_builddir)/font/devpdf \
-	&& cp -f $(devps_srcdir)/freeeuro.afm $@
-
-font/devpdf/EURO: font/devpdf/freeeuro.afm
-	$(AM_V_GEN) ./afmtodit -d font/devpdf/DESC -o font/devpdf/EURO \
-	  -w 333 font/devpdf/freeeuro.afm font/devpdf/map/symbol.map \
-	  EURO
-
-MOSTLYCLEANFILES += font/devpdf/freeeuro.pfa
-font/devpdf/freeeuro.pfa: $(devps_srcdir)/freeeuro.pfa
-	$(AM_V_GEN)$(MKDIR_P) $(top_builddir)/font/devpdf \
-	&& cp -f $(devps_srcdir)/freeeuro.pfa $@
-
-MOSTLYCLEANFILES += font/devpdf/Foundry
 font/devpdf/Foundry: $(devpdf_srcdir)/Foundry.in
 	$(AM_V_at)$(MKDIR_P) $(top_builddir)/font/devpdf/
 if HAVE_URW_FONTS