[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 13/33: - Build src/roff/* - make distcheck now passed the 'confi
From: |
Bertrand Garrigues |
Subject: |
[groff] 13/33: - Build src/roff/* - make distcheck now passed the 'configure' step |
Date: |
Sun, 07 Sep 2014 23:02:08 +0000 |
bgarrigues pushed a commit to branch automake2
in repository groff.
commit 012bf89f3e54369a930bd5822b927203e356fc26
Author: Bertrand Garrigues <address@hidden>
Date: Mon Aug 25 01:01:30 2014 +0200
- Build src/roff/*
- make distcheck now passed the 'configure' step
---
Makefile.am | 4 ++
TESTS | 35 +++++++++++++++++-
src/roff/groff/Makefile.sub | 76 ---------------------------------------
src/roff/groff/groff.am | 39 ++++++++++++++++++++
src/roff/grog/Makefile.sub | 82 -------------------------------------------
src/roff/grog/grog.am | 47 ++++++++++++++++++++++++
src/roff/nroff/Makefile.sub | 20 ----------
src/roff/nroff/nroff.am | 10 +++++
src/roff/troff/Makefile.sub | 49 -------------------------
src/roff/troff/troff.am | 55 +++++++++++++++++++++++++++++
10 files changed, 188 insertions(+), 229 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 19c355c..341bb75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -542,6 +542,10 @@ include $(top_srcdir)/src/preproc/preconv/preconv.am
include $(top_srcdir)/src/preproc/refer/refer.am
include $(top_srcdir)/src/preproc/soelim/soelim.am
include $(top_srcdir)/src/preproc/tbl/tbl.am
+include $(top_srcdir)/src/roff/groff/groff.am
+include $(top_srcdir)/src/roff/grog/grog.am
+include $(top_srcdir)/src/roff/nroff/nroff.am
+include $(top_srcdir)/src/roff/troff/troff.am
include $(top_srcdir)/src/utils/addftinfo/addftinfo.am
include $(top_srcdir)/src/utils/afmtodit/afmtodit.am
include $(top_srcdir)/src/utils/hpftodit/hpftodit.am
diff --git a/TESTS b/TESTS
index c0079d4..ac69477 100644
--- a/TESTS
+++ b/TESTS
@@ -15,6 +15,8 @@ Current status
- Build src/libs/*
- Build src/utils/*
- Build src/preproc/*
+ - Build src/devices/*
+ - Build src/roff/*
Tests
-----
@@ -110,6 +112,12 @@ from src/devices:
- grotty
- gxditview
+from src/roff
+ - groff
+ - grog
+ - nroff
+ - troff
+
In order to check and improve the dependencies, the following targets
were built from a clean environment:
- make lib/libgnu.a
@@ -143,9 +151,18 @@ were built from a clean environment:
- make grops
- make grotty
- make gxditview
+ - make groff
+ - make grog
+ - make nroff
+ - make troff
2.2 make clean
+TODO: following files are not cleaned:
+ - grog
+ - nroff
+ - src/roff/troff/majorminor.cpp
+
The following files remain (this is expected):
- Makefile
- config.status
@@ -202,6 +219,11 @@ Differences with former build system:
2.6 make install
+TODO:
+
+ - groff.am should install groff_opts_no_arg.txt and
+ groff_opts_with_arg.txt
+
mkdir -p ~/tmp/automake
make install DESTDIR=~/tmp/automake
@@ -235,6 +257,8 @@ TODO: src/devices specific rules
2.8 make dist
+TODO: missing files from src/roff
+
groff-1.22.2.tar.gz is generated.
- Files/directories that are not distributed on purpose:
@@ -275,8 +299,15 @@ TODO: src/devices specific rules
2.9 make distcheck
- - configure fails: src/roff/groff/groff.cpp is missing (passed to
- AC_CONFIG_SRCDIR macro)
+ 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
+the install tree).
+
+ make distcheck DESTDIR=~/tmp/automake
+
+ - configure script passed without error
+ - build of src/libs fails (lib.h missing)
Notes
-----
diff --git a/src/roff/groff/Makefile.sub b/src/roff/groff/Makefile.sub
deleted file mode 100644
index d1d3381..0000000
--- a/src/roff/groff/Makefile.sub
+++ /dev/null
@@ -1,76 +0,0 @@
-# Makefile.sub for `groff'
-
-# File position: <groff-source>/src/roff/groff/Makefile.sub
-
-# Copyright (C) 1993-2014
-# Free Software Foundation, Inc.
-
-# Rewritten by Bernd Warken <address@hidden> and
-# Werner LEMBERG <address@hidden>
-
-# Last update: 30 Mar 2014
-
-# `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/>.
-
-########################################################################
-
-PROG=groff$(EXEEXT)
-MAN1=groff.n
-XLIBS=$(LIBGROFF) $(LIBGNU)
-MLIB=$(LIBM)
-OBJS=groff.$(OBJEXT) pipeline.$(OBJEXT)
-CCSRCS=$(srcdir)/groff.cpp
-CSRCS=$(srcdir)/pipeline.c
-HDRS=$(srcdir)/pipeline.h
-
-GROFF_OPTS_OUTPUT=\
- groff_opts_no_arg.txt \
- groff_opts_with_arg.txt
-
-MOSTLYCLEANADD=groff_opts.tmp $(GROFF_OPTS_OUTPUT)
-
-all: $(srcdir)/groff.cpp groff_opts.tmp $(GROFF_OPTS_OUTPUT)
-
-groff_opts.tmp: $(srcdir)/groff.cpp
- @$(GREP) -e ':.*:.*:' $? | sed -e 's/[ \t",]//g' > $@
- @echo -n 'groff options: '
- @cat $@
-
-groff_opts_no_arg.txt: groff_opts.tmp
- @sed -e 's/[a-zA-Z]://g' $? > $@
- @echo -n 'no arg: '
- @cat $@
-
-groff_opts_with_arg.txt: groff_opts_no_arg.txt
- @rm -f $@
- @sed "s/[`cat $?`:]//g" groff_opts.tmp > $@
- @echo -n 'with arg: '
- @cat $@
-
-install_data: $(GROFF_OPTS_OUTPUT)
- -test -d $(DESTDIR)$(libprogramdir) \
- || $(mkinstalldirs) $(DESTDIR)$(libprogramdir)
- for f in $(GROFF_OPTS_OUTPUT); do \
- rm -f $(DESTDIR)$(libprogramdir)/$$f; \
- $(INSTALL_SCRIPT) $$f $(DESTDIR)$(libprogramdir); \
- done
-
-uninstall_sub:
- -for f in $(GROFF_OPTS_OUTPUT); do \
- rm -f $(DESTDIR)$(libprogramdir)/$$f;\
- done
-# XXX This will be removed by `uninstall_dirs' in `$(top_srcdir)/Makefile.in'
-# XXX (And only from there it is successful on an empty directory)
-# -d=$(DESTDIR)$(libprogramdir);\
-# if test -d $$d; then rmdir $$d; fi
diff --git a/src/roff/groff/groff.am b/src/roff/groff/groff.am
new file mode 100644
index 0000000..947d016
--- /dev/null
+++ b/src/roff/groff/groff.am
@@ -0,0 +1,39 @@
+# Makefile.sub for `groff'
+
+# File position: <groff-source>/src/roff/groff/Makefile.sub
+
+# Copyright (C) 1993-2014
+# Free Software Foundation, Inc.
+
+# Rewritten by Bernd Warken <address@hidden> and
+# Werner LEMBERG <address@hidden>
+# Automake migration by Bertrand Garrigues
+
+# Last update: Aug 2014
+
+# `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/>.
+
+########################################################################
+
+bin_PROGRAMS += groff
+groff_LDADD = \
+ libgroff.a \
+ lib/libgnu.a \
+ $(LIBM)
+groff_SOURCES = \
+ src/roff/groff/groff.cpp \
+ src/roff/groff/pipeline.c \
+ src/roff/groff/pipeline.h
+src/roff/groff/groff.$(OBJEXT): defs.h
+man1_MANS += src/roff/groff/groff.n
diff --git a/src/roff/grog/Makefile.sub b/src/roff/grog/Makefile.sub
deleted file mode 100644
index 0257dcd..0000000
--- a/src/roff/grog/Makefile.sub
+++ /dev/null
@@ -1,82 +0,0 @@
-# Makefile.sub for `grog' (integration into the `groff' source tree)
-
-# File position: <groff-source>/src/roff/grog/Makefile.sub
-
-# Copyright (C) 1993, 2006, 2009, 2013-2014
-# Free Software Foundation, Inc.
-
-# Last update: 04 Jun 2014
-
-# This file is part of `grog' which 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/>.
-
-########################################################################
-
-MAN1=grog.n
-MOSTLYCLEANADD=grog $(MAN1)
-
-# not all make programs have $(RM) predefined.
-RM=rm -f
-
-all: grog $(MAN1)
-
-# lib .pl-files
-GROG=$(srcdir)/subs.pl
-GROG_=`echo $(GROG) | sed 's|$(srcdir)/||g'`
-
-
-# Perl version works for all parts of `groff'.
-
-grog: grog.pl $(GROG) $(SH_DEPS_SED_SCRIPT)
- $(RM) $@
- sed -f "$(SH_DEPS_SED_SCRIPT)" \
- -e "1s|^\(#! \).*perl|\\1$(PERL)|" \
- -e "s|@g@|$(g)|g" \
- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
- -e "s|@grog_dir@|$(DESTDIR)$(grog_dir)|g" \
- -e "s|@EGREP@|$(EGREP)|g" \
- -e "s|@VERSION@|$(version)$(revision)|" \
- -e "$(SH_SCRIPT_SED_CMD)" \
- $(srcdir)/grog.pl >$@
- chmod +x $@
-
-.PHONY: install_data
-install_data: grog
- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
- $(RM) $(DESTDIR)$(bindir)/grog
- $(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog
- -test -d $(DESTDIR)$(grog_dir) || $(mkinstalldirs) $(DESTDIR)$(grog_dir)
- for f in $(GROG_); do \
- $(RM) $(DESTDIR)$(grog_dir)/$$f; \
- $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(grog_dir)/$$f; \
- done
-
-.PHONY: uninstall_data
-uninstall_sub:
- $(RM) $(DESTDIR)$(bindir)/grog
- -for f in $(GROG_); do \
- $(RM) $(DESTDIR)$(grog_dir)/$$f; \
- done
- -d=$(DESTDIR)$(grog_dir);\
- if test -d $$d; then rmdir $$d; fi
-
-
-########################################################################
-# Emacs settings
-########################################################################
-#
-# Local Variables:
-# mode: makefile
-# End:
diff --git a/src/roff/grog/grog.am b/src/roff/grog/grog.am
new file mode 100644
index 0000000..c7c36f4
--- /dev/null
+++ b/src/roff/grog/grog.am
@@ -0,0 +1,47 @@
+# grog.am for `grog' (integration into the `groff' source tree)
+
+# File position: <groff-source>/src/roff/grog/grog.am
+
+# Copyright (C) 1993, 2006, 2009, 2013-2014
+# Free Software Foundation, Inc.
+
+# Last update: Aug 2014
+
+# This file is part of `grog' which 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/>.
+
+grog_srcdir = $(top_srcdir)/src/roff/grog
+bin_SCRIPTS += grog
+GROG = src/roff/grog/subs.pl
+
+# grog_dir is defined by a m4 macro
+grogdir = $(grog_dir)
+dist_grog_DATA = $(GROG)
+man1_MANS += src/roff/grog/grog.n
+
+# Perl version works for all parts of `groff'.
+
+grog: $(grog_srcdir)/grog.pl $(GROG) $(SH_DEPS_SED_SCRIPT)
+ $(RM) $@
+ sed -f "$(SH_DEPS_SED_SCRIPT)" \
+ -e "1s|^\(#! \).*perl|\\1$(PERL)|" \
+ -e "s|address@hidden@]|$(g)|g" \
+ -e "s|address@hidden@]|$(DESTDIR)$(bindir)|g" \
+ -e "s|address@hidden@]|$(DESTDIR)$(libdir)|g" \
+ -e "s|address@hidden@]|$(EGREP)|g" \
+ -e "s|address@hidden@]|$(VERSION)|" \
+ -e "$(SH_SCRIPT_SED_CMD)" \
+ $(grog_srcdir)/grog.pl >$@
+ chmod +x $@
diff --git a/src/roff/nroff/Makefile.sub b/src/roff/nroff/Makefile.sub
deleted file mode 100644
index 5b06b09..0000000
--- a/src/roff/nroff/Makefile.sub
+++ /dev/null
@@ -1,20 +0,0 @@
-MAN1=nroff.n
-NAMEPREFIX=$(g)
-MOSTLYCLEANADD=nroff
-
-all: nroff
-
-nroff: nroff.sh $(SH_DEPS_SED_SCRIPT)
- rm -f $@
- sed -f $(SH_DEPS_SED_SCRIPT) \
- -e $(SH_SCRIPT_SED_CMD) \
- -e "s|@VERSION@|$(version)$(revision)|" $(srcdir)/nroff.sh >$@
- chmod +x $@
-
-install_data: nroff
- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
- rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
- $(INSTALL_SCRIPT) nroff $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
-
-uninstall_sub:
- rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
diff --git a/src/roff/nroff/nroff.am b/src/roff/nroff/nroff.am
new file mode 100644
index 0000000..0e182d6
--- /dev/null
+++ b/src/roff/nroff/nroff.am
@@ -0,0 +1,10 @@
+bin_SCRIPTS += nroff
+nroff_srcdir = $(top_srcdir)/src/roff/nroff
+man1_MANS += src/roff/nroff/nroff.n
+
+nroff: $(nroff_srcdir)/nroff.sh $(SH_DEPS_SED_SCRIPT)
+ rm -f $@
+ sed -f $(SH_DEPS_SED_SCRIPT) \
+ -e $(SH_SCRIPT_SED_CMD) \
+ -e "s|address@hidden@]|$(VERSION)|" $(nroff_srcdir)/nroff.sh >$@
+ chmod +x $@
diff --git a/src/roff/troff/Makefile.sub b/src/roff/troff/Makefile.sub
deleted file mode 100644
index 3db9608..0000000
--- a/src/roff/troff/Makefile.sub
+++ /dev/null
@@ -1,49 +0,0 @@
-PROG=troff$(EXEEXT)
-MAN1=troff.n
-XLIBS=$(LIBGROFF) $(LIBGNU)
-MLIB=$(LIBM)
-OBJS=\
- dictionary.$(OBJEXT) \
- div.$(OBJEXT) \
- env.$(OBJEXT) \
- input.$(OBJEXT) \
- majorminor.$(OBJEXT) \
- mtsm.$(OBJEXT) \
- node.$(OBJEXT) \
- number.$(OBJEXT) \
- reg.$(OBJEXT)
-CCSRCS=\
- $(srcdir)/dictionary.cpp \
- $(srcdir)/div.cpp \
- $(srcdir)/env.cpp \
- $(srcdir)/input.cpp \
- majorminor.cpp \
- $(srcdir)/mtsm.cpp \
- $(srcdir)/node.cpp \
- $(srcdir)/number.cpp \
- $(srcdir)/reg.cpp
-HDRS=\
- $(srcdir)/charinfo.h \
- $(srcdir)/dictionary.h \
- $(srcdir)/div.h \
- $(srcdir)/env.h \
- $(srcdir)/hvunits.h \
- $(srcdir)/input.h \
- $(srcdir)/mtsm.h \
- $(srcdir)/node.h \
- $(srcdir)/reg.h \
- $(srcdir)/request.h \
- $(srcdir)/token.h \
- $(srcdir)/troff.h
-GENSRCS=majorminor.cpp
-NAMEPREFIX=$(g)
-
-majorminor.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
- @echo Making $@
- @rm -f $@
- @echo const char \*major_version = \
- \"`sed -e 's/^\([^.]*\)\..*$$/\1/' $(top_srcdir)/VERSION`\"\; >$@
- @echo const char \*minor_version = \
- \"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' $(top_srcdir)/VERSION`\"\; \
- >>$@
- @echo const char \*revision = \"`cat $(top_srcdir)/REVISION`\"\; >>$@
diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am
new file mode 100644
index 0000000..75babb9
--- /dev/null
+++ b/src/roff/troff/troff.am
@@ -0,0 +1,55 @@
+# 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/>.
+
+bin_PROGRAMS += troff
+man1_MANS += src/roff/troff/troff.n
+troff_LDADD = lib/libgnu.a libgroff.a $(LIBM)
+troff_SOURCES = \
+ src/roff/troff/dictionary.cpp \
+ src/roff/troff/div.cpp \
+ src/roff/troff/env.cpp \
+ src/roff/troff/input.cpp \
+ src/roff/troff/mtsm.cpp \
+ src/roff/troff/node.cpp \
+ src/roff/troff/number.cpp \
+ src/roff/troff/reg.cpp \
+ src/roff/troff/env.h \
+ src/roff/troff/node.h \
+ src/roff/troff/troff.h \
+ src/roff/troff/div.h \
+ src/roff/troff/reg.h \
+ src/roff/troff/dictionary.h \
+ src/roff/troff/input.h \
+ src/roff/troff/mtsm.h \
+ src/roff/troff/token.h \
+ src/roff/troff/charinfo.h \
+ src/roff/troff/request.h \
+ src/roff/troff/hvunits.h \
+ src/roff/troff/majorminor.cpp
+
+src/roff/troff/input.$(OBJEXT): defs.h
+
+src/roff/troff/majorminor.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
+ @echo Making $@
+ @rm -f $@
+ @echo const char \*major_version = \
+ \"`sed -e 's/^\([^.]*\)\..*$$/\1/' $(top_srcdir)/VERSION`\"\; >$@
+ @echo const char \*minor_version = \
+ \"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' $(top_srcdir)/VERSION`\"\; \
+ >>$@
+ @echo const char \*revision = \"`cat $(top_srcdir)/REVISION`\"\; >>$@
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 13/33: - Build src/roff/* - make distcheck now passed the 'configure' step,
Bertrand Garrigues <=