[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 09/45: Fix `clean', `mostlyclean' and `dist' in `arch/misc' and
|
From: |
Bertrand Garrigues |
|
Subject: |
[groff] 09/45: Fix `clean', `mostlyclean' and `dist' in `arch/misc' and `src/preproc/*'. |
|
Date: |
Tue, 11 Nov 2014 21:25:51 +0000 |
bgarrigues pushed a commit to branch automake3
in repository groff.
commit 7a6627aa7a7ab95ad59ee126b11f420963eb7c0a
Author: Bertrand Garrigues <address@hidden>
Date: Thu Aug 21 23:56:10 2014 +0200
Fix `clean', `mostlyclean' and `dist' in `arch/misc' and `src/preproc/*'.
Add conditional installation of `arch/mingw' scripts.
---
Makefile.am | 4 +-
TESTS | 26 +++++---
arch/mingw/Makefile.sub | 66 --------------------
.../soelim/soelim.am => arch/mingw/mingw.am | 34 ++++++++--
arch/misc/misc.am | 2 +
configure.ac | 2 +
m4/groff.m4 | 8 +--
src/preproc/eqn/eqn.am | 10 +++
src/preproc/grn/grn.am | 2 +-
src/preproc/pic/pic.am | 6 ++
src/preproc/preconv/preconv.am | 2 +-
src/preproc/refer/refer.am | 5 ++
src/preproc/soelim/soelim.am | 3 +
src/preproc/tbl/tbl.am | 2 +-
14 files changed, 80 insertions(+), 92 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 7dd2010..792413b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -523,6 +523,7 @@ AM_YFLAGS = -d -v
# source directory.
include $(top_srcdir)/lib/gnulib.mk
+include $(top_srcdir)/arch/mingw/mingw.am
include $(top_srcdir)/arch/misc/misc.am
include $(top_srcdir)/src/include/include.am
include $(top_srcdir)/src/libs/libbib/libbib.am
@@ -589,7 +590,8 @@ EXTRA_DIST += \
MORE.STUFF \
PROBLEMS \
PROJECTS \
- README.MinGW
+ README.MinGW \
+ arch/djgpp
MOSTLYCLEANFILES += $(man1_MANS)
diff --git a/TESTS b/TESTS
index 8b1703c..93da33c 100644
--- a/TESTS
+++ b/TESTS
@@ -125,9 +125,7 @@ were built from a clean environment:
2.2 make clean
- TODO: src/preproc
-
-The following files remains (this is expected):
+The following files remain (this is expected):
- Makefile
- config.status
- config.log
@@ -136,6 +134,8 @@ The following files remains (this is expected):
- .deps directories and .dirstamp files
- .n files, afmtodit are cleaned
+ - shdeps.sed is cleaned
+ - binaries from bin_PROGRAMS are cleaned
2.3 make mostlyclean
@@ -145,6 +145,12 @@ The following files remains (this is expected):
version.cpp.
- gnulib's charset.alias, ref-add.sed, ref-del.sed and configmake.h
+Differences with former build system:
+
+ - Programs (listed in bin_PROGRAMS) are not cleaned by 'make
+ mostlyclean'. This could be changed if needed (MOSTLYCLEANFILES +=
+ $(bin_PROGRAMS)).
+
2.4 make distclean
Like 'make clean', but the following files are also cleaned:
@@ -196,11 +202,9 @@ The following files remains (this is expected):
- $(DESTDIR)/usr/local/share/groff/1.22.3/
- $(DESTDIR)/usr/local/share/groff/
-
2.8 make dist
- groff-1.22.3.tar.gz is generated. src/libs .c, .cpp and .am files
- are present.
+ groff-1.22.3.tar.gz is generated.
- Files/directories that are not distributed on purpose:
.gitignore
@@ -212,14 +216,12 @@ The following files remains (this is expected):
TESTS
- Missing files/directories (TODO):
- arch/
contrib/
doc/
font/
man/
src/devices
src/include (except config.hin and include.am)
- src/preproc
src/roff
tmac
test-groff.in
@@ -234,7 +236,13 @@ The following files remains (this is expected):
Makefile.in
aclocal.m4
configure
-
+ src/preproc/eqn/eqn.cpp
+ src/preproc/eqn/eqn.hpp
+ src/preproc/pic/pic.cpp
+ src/preproc/pic/pic.hpp
+ src/preproc/refer/label.hpp
+ src/preproc/refere/label.cpp
+
2.9 make distcheck
- configure fails: src/roff/groff/groff.cpp is missing (passed to
diff --git a/arch/mingw/Makefile.sub b/arch/mingw/Makefile.sub
deleted file mode 100644
index 4c1e957..0000000
--- 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/src/preproc/soelim/soelim.am b/arch/mingw/mingw.am
similarity index 52%
copy from src/preproc/soelim/soelim.am
copy to arch/mingw/mingw.am
index d88c190..49b259e 100644
--- a/src/preproc/soelim/soelim.am
+++ b/arch/mingw/mingw.am
@@ -1,6 +1,6 @@
# Copyright (C) 2014
-# Free Software Foundation, Inc.
-#
+# Free Software Foundation, Inc.
+#
# This file is part of groff.
#
# groff is free software; you can redistribute it and/or modify it under
@@ -15,8 +15,30 @@
#
# 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
-bin_PROGRAMS += soelim
-soelim_LDADD = libgroff.a $(LIBM)
-soelim_SOURCES = src/preproc/soelim/soelim.cpp
-man1_MANS += src/preproc/soelim/soelim.n
+if BUILD_WINSCRIPTS
+bin_SCRIPTS += $(WINSCRIPTS)
+else
+EXTRA_DIST += $(WINSCRIPTS)
+endif
diff --git a/arch/misc/misc.am b/arch/misc/misc.am
index 7807a26..3b4c004 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)" > $@
diff --git a/configure.ac b/configure.ac
index f4ee29d..5c72c8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,6 +171,8 @@ GROFF_PNMTOPS_NOSETPAGE
gl_GLIBC21
gl_LOCALCHARSET
+AM_CONDITIONAL([BUILD_WINSCRIPTS], [test -n "$make_winscripts"])
+
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/m4/groff.m4 b/m4/groff.m4
index 28ff570..2f49da1 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -998,18 +998,12 @@ AC_DEFUN([GROFF_CMD_FILES],
case "$host_os" in
*mingw*)
make_winscripts=winscripts
- make_install_winscripts=install_winscripts
- make_uninstall_winscripts=uninstall_winscripts
AC_MSG_RESULT([yes]) ;;
*)
make_winscripts=
- make_install_winscripts=
- make_uninstall_winscripts=
AC_MSG_RESULT([no]) ;;
esac
- AC_SUBST([make_winscripts])
- AC_SUBST([make_install_winscripts])
- AC_SUBST([make_uninstall_winscripts])])
+ AC_SUBST([make_winscripts])])
# Check whether we need a declaration for a function.
diff --git a/src/preproc/eqn/eqn.am b/src/preproc/eqn/eqn.am
index 13898c4..0c3bd19 100644
--- a/src/preproc/eqn/eqn.am
+++ b/src/preproc/eqn/eqn.am
@@ -44,8 +44,18 @@ eqn_SOURCES = \
src/preproc/eqn/eqn.h
man1_MANS += src/preproc/eqn/eqn.n src/preproc/eqn/neqn.n
+EXTRA_DIST += \
+ src/preproc/eqn/TODO \
+ src/preproc/eqn/neqn.sh \
+ src/preproc/eqn/eqn.man \
+ src/preproc/eqn/neqn.man
src/preproc/eqn/eqn-lex.$(OBJEXT): src/preproc/eqn/eqn.hpp
+CLEANFILES += \
+ src/preproc/eqn/eqn.hpp \
+ src/preproc/eqn/eqn.cpp \
+ src/preproc/eqn/eqn.output
+MOSTLYCLEANFILES += neqn
neqn: $(top_srcdir)/src/preproc/eqn/neqn.sh $(SH_DEPS_SED_SCRIPT)
$(RM) $@
diff --git a/src/preproc/grn/grn.am b/src/preproc/grn/grn.am
index c5a1248..49917d9 100644
--- a/src/preproc/grn/grn.am
+++ b/src/preproc/grn/grn.am
@@ -26,4 +26,4 @@ grn_SOURCES = \
src/preproc/grn/main.$(OBJEXT): defs.h
grn_LDADD = lib/libgnu.a libgroff.a $(LIBM)
man1_MANS += src/preproc/grn/grn.n
-
+EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.man
diff --git a/src/preproc/pic/pic.am b/src/preproc/pic/pic.am
index 176f9ce..16ec882 100644
--- a/src/preproc/pic/pic.am
+++ b/src/preproc/pic/pic.am
@@ -39,3 +39,9 @@ pic_CPPFLAGS = $(AM_CPPFLAGS) \
man1_MANS += src/preproc/pic/pic.n
src/preproc/pic/pic-lex.$(OBJEXT): src/preproc/pic/pic.hpp
+EXTRA_DIST += src/preproc/pic/pic.n src/preproc/pic/TODO
+CLEANFILES += \
+ src/preproc/pic/pic.cpp \
+ src/preproc/pic/pic.hpp \
+ src/preproc/pic/pic.output
+
diff --git a/src/preproc/preconv/preconv.am b/src/preproc/preconv/preconv.am
index b903bc0..a5777b0 100644
--- a/src/preproc/preconv/preconv.am
+++ b/src/preproc/preconv/preconv.am
@@ -20,4 +20,4 @@ bin_PROGRAMS += preconv
preconv_LDADD = libgroff.a $(LIBM) $(LIBICONV)
preconv_SOURCES = src/preproc/preconv/preconv.cpp
man1_MANS += src/preproc/preconv/preconv.n
-
+EXTRA_DIST += src/preproc/preconv/preconv.man
diff --git a/src/preproc/refer/refer.am b/src/preproc/refer/refer.am
index 3522509..4700a41 100644
--- a/src/preproc/refer/refer.am
+++ b/src/preproc/refer/refer.am
@@ -30,6 +30,11 @@ refer_SOURCES = \
src/preproc/refer/token.h \
src/preproc/refer/command.h
man1_MANS += src/preproc/refer/refer.n
+EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.man
+CLEANFILES += \
+ src/preproc/refer/label.cpp \
+ src/preproc/refer/label.hpp \
+ src/preproc/refer/label.output
# As refer_CPPFLAGS was set, all the .o have a 'refer-' prefix
src/preproc/refer/refer-command.$(OBJEXT): defs.h
src/preproc/refer/refer-ref.$(OBJEXT): defs.h
diff --git a/src/preproc/soelim/soelim.am b/src/preproc/soelim/soelim.am
index d88c190..d04d79a 100644
--- a/src/preproc/soelim/soelim.am
+++ b/src/preproc/soelim/soelim.am
@@ -20,3 +20,6 @@ bin_PROGRAMS += soelim
soelim_LDADD = libgroff.a $(LIBM)
soelim_SOURCES = src/preproc/soelim/soelim.cpp
man1_MANS += src/preproc/soelim/soelim.n
+EXTRA_DIST += \
+ src/preproc/soelim/TODO \
+ src/preproc/soelim/soelim.man
diff --git a/src/preproc/tbl/tbl.am b/src/preproc/tbl/tbl.am
index b64a0cd..de90c2d 100644
--- a/src/preproc/tbl/tbl.am
+++ b/src/preproc/tbl/tbl.am
@@ -23,4 +23,4 @@ tbl_SOURCES = \
src/preproc/tbl/table.cpp \
src/preproc/tbl/table.h
man1_MANS += src/preproc/tbl/tbl.n
-
+EXTRA_DIST += src/preproc/tbl/tbl.man
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 09/45: Fix `clean', `mostlyclean' and `dist' in `arch/misc' and `src/preproc/*'.,
Bertrand Garrigues <=