Fix `clean', `mostlyclean', `uninstall', `dist' for the `font' dir.

17 files changed, 117 insertions, 24 deletions

diff --git a/Makefile.am b/Makefile.am
index 4f1ca9d23..a6e1bc4e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -516,10 +516,6 @@ man7_MANS =
 # for lex/yacc
 AM_YFLAGS = -d -v
 
-# Scripts for font files generation
-GENFONTSSH=$(top_srcdir)/font/scripts/genfonts.sh
-GENDESCSH = $(top_srcdir)/font/scripts/gendesc.sh
-
 # Non-recursive makefile system. See Automake manual '7.3 An
 # Alternative Approach to Subdirectories'. We use a single Makefile.am
 # that includes other .am files, rather than using SUBDIRS.  Note that
@@ -543,6 +539,7 @@ include $(top_srcdir)/font/devlj4/devlj4.am
 include $(top_srcdir)/font/devpdf/devpdf.am
 include $(top_srcdir)/font/devps/devps.am
 include $(top_srcdir)/font/devutf8/devutf8.am
+include $(top_srcdir)/font/scripts/scripts.am
 include $(top_srcdir)/src/include/include.am
 include $(top_srcdir)/src/libs/libbib/libbib.am
 include $(top_srcdir)/src/libs/libdriver/libdriver.am
@@ -594,13 +591,21 @@ lib/localcharset.$(OBJEXT): lib/configmake.h
 
 # directories specific to groff
 uninstall-hook: uninstall_groffdirs
-uninstall_groffdirs:
+uninstall_groffdirs: uninstall_devpdf
 	if test -d $(DESTDIR)$(datasubdir); then \
+	  rm -rf $(DESTDIR)$(fontdir); \
+	  rm -rf $(DESTDIR)$(oldfontdir); \
 	  rmdir $(DESTDIR)$(datasubdir); \
 	fi
 	if test -d $(DESTDIR)$(dataprogramdir); then \
 	  rmdir $(DESTDIR)$(dataprogramdir); \
 	fi
+	if test -d $(DESTDIR)$(grog_dir); then \
+	  rmdir $(DESTDIR)$(grog_dir); \
+	fi
+	if test -d $(DESTDIR)$(libprogramdir); then \
+	  rmdir $(DESTDIR)$(libprogramdir); \
+	fi
 
 # Other files that should be present in the distribution tarball.
 EXTRA_DIST += \
diff --git a/TESTS b/TESTS
index 3ef5afcc7..08f086053 100644
--- a/TESTS
+++ b/TESTS
@@ -172,8 +172,6 @@ were built from a clean environment:
 
 2.2 make clean
 
-TODO: font files are not cleaned
-
 The following files remain (this is expected):
   - Makefile
   - config.status
@@ -188,13 +186,12 @@ The following files remain (this is expected):
 
 2.3 make mostlyclean
 
-TODO: font files
-
   Like 'make clean', but the following files also remain (expected):
   - lib*.a
   - libgroff.a's charset.alias, ref-add.sed, ref-del.sed, and
     version.cpp.
   - gnulib's charset.alias, ref-add.sed, ref-del.sed and configmake.h
+  - src/preproc generated .cpp, hpp, and .output files
 
 Differences with former build system:
 
@@ -262,16 +259,16 @@ Diff with previous build system:
 
 2.7 make uninstall
 
-TODO: currently fails (fails to remove $(DESTDIR)/usr/local/share/groff/1.22.3)
-
   Removes:
 
   - $(DESTDIR)/usr/local/lib/charset.alias if exists
   - $(DESTDIR)/usr/local/bin/*
   - $(DESTDIR)/usr/local/man/man1/*
+  - $(DESTDIR)/usr/local/man/man5/*
   - $(DESTDIR)/usr/local/share/groff/1.22.3/eign
   - $(DESTDIR)/usr/local/share/groff/1.22.3/
-  - $(DESTDIR)/usr/local/man/man5/*
+  - $(DESTDIR)/usr/local/share/groff/1.22.3/font
+  - $(DESTDIR)/usr/local/share/groff/1.22.3/oldfont
   - $(DESTDIR)/usr/local/share/groff/
   - $(DESTDIR)/usr/local/lib/X11/app-defaults/GXditview and
     GXditview-color. However, GXditview.old and GXditview-color.old
@@ -279,9 +276,6 @@ TODO: currently fails (fails to remove $(DESTDIR)/usr/local/share/groff/1.22.3)
   
 2.8 make dist
 
-TODO: missing fonts, some files which should not be distributed are
-present in the tarball.
-
   groff-1.22.3.tar.gz is generated.
 
   - Files/directories that are not distributed on purpose:
@@ -296,7 +290,6 @@ present in the tarball.
   - Missing files/directories (TODO):
     contrib/
     doc/
-    font/
     man/
     tmac
     test-groff.in
@@ -320,8 +313,6 @@ present in the tarball.
     
 2.9 make distcheck
   
-To be checked when install, clean, and dist are fixed.
-
   This will attempt to make a tarball, and from this tarball, build
 the package(out-of-source build), clean it (checking that no file
 remains), install it, uninstall it (checking that no file remains in
diff --git a/font/devX100-12/devX100-12.am b/font/devX100-12/devX100-12.am
index db3d3c72c..2681b31b2 100644
--- a/font/devX100-12/devX100-12.am
+++ b/font/devX100-12/devX100-12.am
@@ -38,3 +38,5 @@ DEVX10012FONTS = \
 
 devX10012fontdir = $(fontdir)/devX100-12
 devX10012font_DATA = $(DEVX10012FONTS)
+
+EXTRA_DIST += $(DEVX10012FONTS)
diff --git a/font/devX100/devX100.am b/font/devX100/devX100.am
index 742e6001d..78a617018 100644
--- a/font/devX100/devX100.am
+++ b/font/devX100/devX100.am
@@ -39,3 +39,4 @@ DEVX100FONTS = \
 devX100fontdir = $(fontdir)/devX100
 devX100font_DATA = $(DEVX100FONTS)
 
+EXTRA_DIST += $(DEVX100FONTS)
diff --git a/font/devX75-12/devX75-12.am b/font/devX75-12/devX75-12.am
index b588f788c..23a777361 100644
--- a/font/devX75-12/devX75-12.am
+++ b/font/devX75-12/devX75-12.am
@@ -38,3 +38,5 @@ DEVX7512FONTS = \
 
 devX7512fontdir = $(fontdir)/devX75-12
 devX7512font_DATA = $(DEVX7512FONTS)
+
+EXTRA_DIST += $(DEVX7512FONTS)
diff --git a/font/devX75/devX75.am b/font/devX75/devX75.am
index 90e661dd3..c05dc76a9 100644
--- a/font/devX75/devX75.am
+++ b/font/devX75/devX75.am
@@ -38,3 +38,5 @@ DEVX75FONTS = \
 
 devX75fontdir = $(fontdir)/devX75
 devX75font_DATA = $(DEVX75FONTS)
+
+EXTRA_DIST += $(DEVX75FONTS)
diff --git a/font/devascii/devascii.am b/font/devascii/devascii.am
index 93252345d..5e2c08df7 100644
--- a/font/devascii/devascii.am
+++ b/font/devascii/devascii.am
@@ -27,6 +27,10 @@ DEVASCIILPI = 6
 
 devasciifontdir = $(fontdir)/devascii
 devasciifont_DATA = $(DEVASCIIFONTSFILES) font/devascii/DESC
+MOSTLYCLEANFILES += $(DEVASCIIFONTSFILES) font/devascii/DESC
+EXTRA_DIST += \
+  font/devascii/R.proto \
+  font/devascii/DESC.proto
 
 $(DEVASCIIFONTSFILES): $(devascii_srcdir)/R.proto
 	@echo Making $@
diff --git a/font/devcp1047/devcp1047.am b/font/devcp1047/devcp1047.am
index 9df9c73c9..1a49f5d1f 100644
--- a/font/devcp1047/devcp1047.am
+++ b/font/devcp1047/devcp1047.am
@@ -27,6 +27,8 @@ DEVCP1047LPI = 6
 
 devcp1047fontdir = $(fontdir)/devcp1047
 devcp1047font_DATA = $(DEVCP1047FONTSFILES) font/devcp1047/DESC
+MOSTLYCLEANFILES += $(DEVCP1047FONTSFILES) font/devcp1047/DESC
+EXTRA_DIST += font/devcp1047/R.proto font/devcp1047/DESC.proto
 
 $(DEVCP1047FONTSFILES): $(devcp1047_srcdir)/R.proto
 	@echo Making $@
diff --git a/font/devdvi/devdvi.am b/font/devdvi/devdvi.am
index 4126f4ab5..d19bff10f 100644
--- a/font/devdvi/devdvi.am
+++ b/font/devdvi/devdvi.am
@@ -75,6 +75,9 @@ DEVDVIGENFILES = \
 devdvigendir = $(fontdir)/devdvi/generate
 devdvigen_DATA = $(DEVDVIGENFILES)
 
+EXTRA_DIST += $(DEVDVIFONTFILES) $(DEVDVIGENFILES) font/devdvi/DESC.in
+MOSTLYCLEANFILES += font/devdvi/DESC
+
 font/devdvi/DESC: $(devdvi_srcdir)/DESC.in
 	@echo Making $@
 	@$(MKDIR_P) `dirname $@`
diff --git a/font/devhtml/devhtml.am b/font/devhtml/devhtml.am
index 122423816..00f982ac0 100644
--- a/font/devhtml/devhtml.am
+++ b/font/devhtml/devhtml.am
@@ -35,6 +35,11 @@ DEVHTMLLPI = 6
 
 devhtmlfontdir = $(fontdir)/devhtml
 devhtmlfont_DATA = $(DEVHTMLFONTSFILES) font/devhtml/DESC
+MOSTLYCLEANFILES += $(DEVHTMLFONTSFILES) font/devhtml/DESC
+EXTRA_DIST += \
+  font/devhtml/R.proto \
+  font/devhtml/DESC.proto \
+  font/devhtml/R.in
 
 $(DEVHTMLFONTSFILES): $(devhtml_srcdir)/R.proto
 	@echo Making $@
diff --git a/font/devlatin1/devlatin1.am b/font/devlatin1/devlatin1.am
index 854235e11..550868237 100644
--- a/font/devlatin1/devlatin1.am
+++ b/font/devlatin1/devlatin1.am
@@ -27,6 +27,8 @@ DEVLATIN1LPI = 6
 
 devlatin1fontdir = $(fontdir)/devlatin1
 devlatin1font_DATA = $(DEVLATIN1FONTSFILES) font/devlatin1/DESC
+MOSTLYCLEANFILES += $(DEVLATIN1FONTSFILES) font/devlatin1/DESC
+EXTRA_DIST += font/devlatin1/R.proto font/devlatin1/DESC.proto
 
 $(DEVLATIN1FONTSFILES): $(devlatin1_srcdir)/R.proto
 	@echo Making $@
diff --git a/font/devlbp/devlbp.am b/font/devlbp/devlbp.am
index 58e94fba1..7c8effe03 100644
--- a/font/devlbp/devlbp.am
+++ b/font/devlbp/devlbp.am
@@ -39,6 +39,8 @@ DEVLBPFONTFILES = \
   font/devlbp/EI
 devlbpfontdir = $(fontdir)/devlbp
 devlbpfont_DATA = $(DEVLBPFONTFILES) font/devlbp/DESC
+EXTRA_DIST += $(DEVLBPFONTFILES) font/devlbp/DESC.in
+MOSTLYCLEANFILES += font/devlbp/DESC
 
 font/devlbp/DESC: $(devlbp_srcdir)/DESC.in
 	@echo Making $@
diff --git a/font/devlj4/devlj4.am b/font/devlj4/devlj4.am
index a66427e88..de6e5f798 100644
--- a/font/devlj4/devlj4.am
+++ b/font/devlj4/devlj4.am
@@ -68,7 +68,8 @@ DEVLJ4FONTFILES = \
   font/devlj4/WINGDINGS
 
 devlj4fontdir = $(fontdir)/devlj4
-devlj4font_DATA = $(DEVLJ4FONTFILES) font/devlj4/DESC
+dist_devlj4font_DATA = $(DEVLJ4FONTFILES) 
+nodist_devlj4font_DATA = font/devlj4/DESC
 
 DEVLJ4GENFILES = \
   font/devlj4/generate/Makefile \
@@ -78,7 +79,11 @@ DEVLJ4GENFILES = \
   font/devlj4/generate/wingdings.map \
   font/devlj4/generate/special.awk
 devlj4fontgendir = $(devlj4fontdir)/generate
-devlj4fontgen_DATA = $(DEVLJ4GENFILES)
+dist_devlj4fontgen_DATA = $(DEVLJ4GENFILES)
+
+EXTRA_DIST += font/devlj4/DESC.in
+
+MOSTLYCLEANFILES += font/devlj4/DESC
 
 font/devlj4/DESC: $(devlj4_srcdir)/DESC.in
 	@echo Making $@
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index 2e36517e7..449badc81 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -26,6 +26,13 @@ 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/*`
 
+MOSTLYCLEANFILES += \
+  font/devpdf/download \
+  font/devpdf/DESC \
+  font/devpdf/Foundry \
+  font/devpdf/build_font_files \
+  font/devpdf/util/BuildFoundries
+
 devpdffontdir = $(fontdir)/devpdf
 devpdffont_DATA = \
   font/devpdf/DESC \
@@ -43,7 +50,12 @@ DEVPDFFONTMAP_2 = font/devpdf/map/symbolmap
 devpdffontmap_DATA = $(DEVPDFFONTMAP_1) $(DEVPDFFONTMAP_2)
 
 devpdffontutildir = $(devpdffontdir)/util
-devpdffontutil_DATA = font/devpdf/util/BuildFoundries
+nodist_devpdffontutil_DATA = font/devpdf/util/BuildFoundries
+
+EXTRA_DIST += \
+  font/devpdf/DESC.in \
+  font/devpdf/Foundry.in \
+  font/devpdf/util
 
 font/devpdf/enc/text.enc:
 	@$(MKDIR_P) $(top_builddir)/font/devpdf/enc
@@ -111,6 +123,14 @@ font/devpdf/build_font_files: afmtodit font/devpdf/DESC $(devpdffontenc_DATA) $(
 	   >> $(top_builddir)/font/devpdf/download
 	@touch $@
 
+mostlyclean-local: mostlyclean_devpdf_extra
+mostlyclean_devpdf_extra:
+	@echo Cleaning font/devpdf
+	rm -rf $(top_builddir)/font/devpdf/enc $(top_builddir)/font/devpdf/map;
+	for f in $(GROFF_FONT_FILES); do \
+	   rm -f $(top_builddir)/font/devpdf/$$f; \
+	done
+
 install-data-local: install_devpdf
 install_devpdf:
 	@echo Installing devpdf files
@@ -125,3 +145,23 @@ install_devpdf:
 	  fi; \
 	done
 	$(INSTALL_DATA) $(top_builddir)/font/devpdf/download $(DESTDIR)$(devpdffontdir)/
+
+uninstall-hook: uninstall_devpdf
+uninstall_devpdf:
+	@echo Uninstalling devpdf files
+	if test -d $(DESTDIR)$(devpdffontdir); then \
+	  for f in $(GROFF_FONT_FILES); do \
+	    rm -f $(DESTDIR)$(devpdffontdir)/$$f; \
+	  done; \
+	  if test -d $(DESTDIR)$(devpdffontutildir); then \
+	    rmdir $(DESTDIR)$(devpdffontutildir); \
+	  fi; \
+	  if test -d $(DESTDIR)$(devpdffontencdir); then \
+	    rmdir $(DESTDIR)$(devpdffontencdir); \
+	  fi; \
+	  if test -d $(DESTDIR)$(devpdffontmapdir); then \
+	    rmdir $(DESTDIR)$(devpdffontmapdir); \
+	  fi; \
+	  rm -f $(DESTDIR)$(devpdffontdir)/download; \
+	  rmdir $(DESTDIR)$(devpdffontdir); \
+	fi
diff --git a/font/devps/devps.am b/font/devps/devps.am
index 0acb877ac..42ea38ac1 100644
--- a/font/devps/devps.am
+++ b/font/devps/devps.am
@@ -68,7 +68,8 @@ DEVPSFONTFILES_GENERATED = \
   font/devps/zapfdr.pfa \
   font/devps/symbolsl.pfa
 devpsfontdir = $(fontdir)/devps
-devpsfont_DATA = $(DEVPSFONTFILES) $(DEVPSFONTFILES_GENERATED)
+dist_devpsfont_DATA = $(DEVPSFONTFILES) 
+nodist_devpsfont_DATA = $(DEVPSFONTFILES_GENERATED)
 
 # these files will be installed in oldfontdir
 OLDDEVPSFONTFILES = \
@@ -103,7 +104,7 @@ OLDDEVPSFONTFILES = \
   font/devps/old/zapfdr.afm \
   font/devps/old/zapfdr.ps
 olddevpsfontdir = $(oldfontdir)/devps
-olddevpsfont_DATA = $(OLDDEVPSFONTFILES)
+dist_olddevpsfont_DATA = $(OLDDEVPSFONTFILES)
 
 # Files installed in $(devfontdir)/generate
 DEVPSGENFILES = \
@@ -118,7 +119,23 @@ DEVPSGENSCRIPTS = \
   font/devps/generate/afmname \
   font/devps/generate/symbol.sed
 devpsgendir = $(devpsfontdir)/generate
-devpsgen_DATA = $(DEVPSGENFILES) $(DEVPSGENSCRIPTS)
+dist_devpsgen_DATA = $(DEVPSGENFILES) $(DEVPSGENSCRIPTS)
+
+MOSTLYCLEANFILES += $(DEVPSFONTFILES_GENERATED)
+EXTRA_DIST += \
+  font/devps/symbolmap \
+  font/devps/DESC.in  \
+  font/devps/prologue.ps \
+  font/devps/psstrip.sed \
+  font/devps/symbol.afm \
+  font/devps/symbolsl.ps \
+  font/devps/zapfdr.afm \
+  font/devps/zapfdr.ps \
+  font/devps/generate/freeeuro.sfd \
+  font/devps/generate/make-zapfdr \
+  font/devps/generate/symbolsl.awk \
+  font/devps/generate/sfdtopfa.pe \
+  font/devps/generate/zapfdr.sed
 
 font/devps/DESC: $(devps_srcdir)/DESC.in
 	@$(MKDIR_P) font/devps
diff --git a/font/devutf8/devutf8.am b/font/devutf8/devutf8.am
index 6622ef010..d101e32fc 100644
--- a/font/devutf8/devutf8.am
+++ b/font/devutf8/devutf8.am
@@ -27,6 +27,12 @@ DEVUTF8LPI = 6
 
 devutf8fontdir = $(fontdir)/devutf8
 devutf8font_DATA = $(DEVUTF8FONTSFILES) font/devutf8/DESC
+MOSTLYCLEANFILES += $(DEVUTF8FONTSFILES) font/devutf8/DESC
+EXTRA_DIST += \
+  font/devutf8/R.proto \
+  font/devutf8/DESC.proto \
+  font/devutf8/NOTES \
+  font/devutf8/R.in
 
 $(DEVUTF8FONTSFILES): $(devutf8_srcdir)/R.proto
 	@echo Making $@
diff --git a/font/scripts/scripts.am b/font/scripts/scripts.am
new file mode 100644
index 000000000..f384e67bb
--- /dev/null
+++ b/font/scripts/scripts.am
@@ -0,0 +1,4 @@
+# Scripts for font files generation
+GENFONTSSH=$(top_srcdir)/font/scripts/genfonts.sh
+GENDESCSH = $(top_srcdir)/font/scripts/gendesc.sh
+EXTRA_DIST += $(GENFONTSSH) $(GENDESCSH)