Fix `clean', `mostlyclean' and `dist' in `arch/misc' and `src/preproc/*'.

Add conditional installation of `arch/mingw' scripts.

3 files changed, 46 insertions, 66 deletions

diff --git a/arch/mingw/Makefile.sub b/arch/mingw/Makefile.sub
deleted file mode 100644
index 4c1e95768..000000000
--- a/arch/mingw/Makefile.sub
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright (C) 2014
-#   Free Software Foundation, Inc.
-#
-# This file 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 3 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/>.
-#
-# Makefile.sub
-#
-WINSCRIPTS=\
-  afmtodit.cmd \
-  chem.cmd \
-  gperl.cmd \
-  gpinyin.cmd \
-  grap2graph.cmd \
-  groffer.cmd \
-  grog.cmd \
-  gropdf.cmd \
-  mmroff.cmd \
-  neqn.cmd \
-  pdfmom.cmd \
-  roff2dvi.cmd \
-  roff2html.cmd \
-  roff2pdf.cmd \
-  roff2ps.cmd \
-  roff2text.cmd \
-  roff2x.cmd
-
-RM=rm -f
-
-all: $(make_winscripts)
-install_data: $(make_install_winscripts)
-uninstall_sub: $(make_uninstall_winscripts)
-
-winscripts: $(WINSCRIPTS)
-
-install_winscripts: $(WINSCRIPTS)
-	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-	for f in $(WINSCRIPTS); do \
-	  $(RM) $(DESTDIR)$(bindir)/$$f; \
-	  $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(bindir)/$$f; \
-	done
-
-uninstall_winscripts:
-	-for f in $(WINSCRIPTS); do \
-	  $(RM) $(DESTDIR)$(bindir)/$$f; \
-	done
-
-########################################################################
-# Emacs settings
-########################################################################
-#
-# Local Variables:
-# mode: makefile
-# End:
diff --git a/arch/mingw/mingw.am b/arch/mingw/mingw.am
new file mode 100644
index 000000000..49b259e6d
--- /dev/null
+++ b/arch/mingw/mingw.am
@@ -0,0 +1,44 @@
+# Copyright (C) 2014
+#   Free Software Foundation, Inc.
+#
+# This file 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 3 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/>.
+#
+# mingw.am
+#
+WINSCRIPTS=\
+  arch/mingw/afmtodit.cmd \
+  arch/mingw/chem.cmd \
+  arch/mingw/gperl.cmd \
+  arch/mingw/gpinyin.cmd \
+  arch/mingw/grap2graph.cmd \
+  arch/mingw/groffer.cmd \
+  arch/mingw/grog.cmd \
+  arch/mingw/gropdf.cmd \
+  arch/mingw/mmroff.cmd \
+  arch/mingw/neqn.cmd \
+  arch/mingw/pdfmom.cmd \
+  arch/mingw/roff2dvi.cmd \
+  arch/mingw/roff2html.cmd \
+  arch/mingw/roff2pdf.cmd \
+  arch/mingw/roff2ps.cmd \
+  arch/mingw/roff2text.cmd \
+  arch/mingw/roff2x.cmd
+
+if BUILD_WINSCRIPTS
+bin_SCRIPTS += $(WINSCRIPTS)
+else
+EXTRA_DIST += $(WINSCRIPTS)
+endif
diff --git a/arch/misc/misc.am b/arch/misc/misc.am
index 7807a2697..3b4c004ca 100644
--- a/arch/misc/misc.am
+++ b/arch/misc/misc.am
@@ -18,6 +18,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
+EXTRA_DIST += arch/misc/shdeps.sh
+MOSTLYCLEANFILES += shdeps.sed
 
 shdeps.sed: $(top_srcdir)/arch/misc/shdeps.sh
 	$(SHELL) $(top_srcdir)/arch/misc/shdeps.sh "$(RT_SEP)" "$(SH_SEP)" "$(bindir)" > $@