summaryrefslogtreecommitdiffstats
path: root/doc/tools
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-06-10 19:41:09 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-06-10 19:41:09 +0000
commit110445cba5510f44c0fbd2ff13d7126459c188c6 (patch)
tree9a60f84af1b4e63d04d3af31f99066767ed241fa /doc/tools
parentRemoved old bmenu version. (diff)
downloadrtems-110445cba5510f44c0fbd2ff13d7126459c188c6.tar.bz2
Patch rtems-rc-4.5.0-21.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
which splits the current monolithic specs files into a sequence of subparts. These can be concatenated togather to make a the whole .spec file. This cleans up the maintenance problem of having "all languages" and a "C/C++ only" gccnewlib spec files. Plus it should make it easier to produce variants like the gdb-m68k-bdm which require special hackery. :) Ralf's comments: It addresses the way *.spec.in get composed inside of the source tree. Changes: * Each spec.in is broken into several files (*.add), one *.add file per sub-package. * Each Makefile.am composes spec.ins from the *.add files * Removal of redundant automake support files. * Default value for BuildRoot changed to /tmp/<spec-file-name> * %clean stage added to *specs Advantages (IMHO). * The *.add files are easier to adminstrate and more flexible in comparison to the former *.specs.ins. * gccnewlib_c_only.spec.in now is composed from the same sources as gccnewlib.spec.in (less errors) * If using the default BuildRoot --clean now deletes all files that were generated while building. Notes: * rtems.spec.in has not yet been adapted to the scheme used for the other *spec.ins * Except for cosmetical changes the internals of the *.spec files should not have changed. To Apply: cvs rm -f scripts/binutils/binutils.spec.in cvs rm -f scripts/gccnewlib/gccnewlib.spec.in cvs rm -f scripts/gccnewlib/gccnewlib_c_only.spec.in cvs rm -f scripts/gdb/gdb.spec.in cvs rm -f scripts/config.sub cvs rm -f scripts/config.guess cvs rm -f scripts/install-sh cvs rm -f scripts/mkinstalldirs cvs rm -f scripts/missing patch -p1 < rtems-rc-4.5.0-21.diff cvs add scripts/*/*.add cvs add scripts/*/README
Diffstat (limited to 'doc/tools')
-rw-r--r--doc/tools/Makefile.am11
-rw-r--r--doc/tools/bmenu/Makefile.am8
-rw-r--r--doc/tools/pdl2texi/Makefile.am18
-rw-r--r--doc/tools/src2html/Makefile.am4
-rw-r--r--doc/tools/src2html1.4a/Ctags/Makefile.am8
-rw-r--r--doc/tools/src2html1.4a/FreeBSD/Makefile.am22
-rw-r--r--doc/tools/src2html1.4a/Makefile.am3
-rw-r--r--doc/tools/src2html1.4a/ctags-emacs/Makefile.am2
-rw-r--r--doc/tools/texi2www/Makefile.am14
9 files changed, 32 insertions, 58 deletions
diff --git a/doc/tools/Makefile.am b/doc/tools/Makefile.am
index edc597a831..b2ff2cfb07 100644
--- a/doc/tools/Makefile.am
+++ b/doc/tools/Makefile.am
@@ -1,13 +1,8 @@
## $Id$
AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
-EXTRA_DIST = \
-word-replace2
+EXTRA_DIST = word-replace2
-SUBDIRS = \
-bmenu \
-src2html1.4a \
-src2html \
-pdl2texi \
-texi2www
+SUBDIRS = bmenu src2html1.4a src2html pdl2texi texi2www
diff --git a/doc/tools/bmenu/Makefile.am b/doc/tools/bmenu/Makefile.am
index ae0b3df66f..1be05d78ee 100644
--- a/doc/tools/bmenu/Makefile.am
+++ b/doc/tools/bmenu/Makefile.am
@@ -8,10 +8,8 @@
AUTOMAKE_OPTIONS = foreign 1.4
-noinst_PROGRAMS=bmenu2
+noinst_PROGRAMS = bmenu2
-bmenu2_SOURCES = \
-address.h chain.c isr.h \
-address.inl chain.h bmenu2.c \
-base.h chain.inl system.h
+bmenu2_SOURCES = address.h chain.c isr.h address.inl chain.h bmenu2.c base.h \
+ chain.inl system.h
diff --git a/doc/tools/pdl2texi/Makefile.am b/doc/tools/pdl2texi/Makefile.am
index 0d31296e7a..f31dceeb82 100644
--- a/doc/tools/pdl2texi/Makefile.am
+++ b/doc/tools/pdl2texi/Makefile.am
@@ -6,20 +6,18 @@
# $Id$
#
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
-PROG=pdl2texi
-noinst_PROGRAMS=$(PROG)
+PROG = pdl2texi
+noinst_PROGRAMS = $(PROG)
#$(BASE).texi: $(BASE).d ./$(PROG)
# ./$(PROG) $(BASE).d
-pdl2texi_SOURCES = \
-address.inl chain.h main.c system.h \
-base.h chain.inl address.h chain.c \
-isr.h
+pdl2texi_SOURCES = address.inl chain.h main.c system.h base.h chain.inl \
+ address.h chain.c isr.h
-BASE=sample
+BASE = sample
#drive: Drive
#Drive: $(BASE).txt
@@ -55,5 +53,5 @@ clean:
rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
rm -f test_cases/*.txt test_cases/*.texi
-EXTRA_DIST = test_cases/enum.d test_cases/enumbad.d test_cases/table.d \
- s.d sample.d
+EXTRA_DIST = test_cases/enum.d test_cases/enumbad.d test_cases/table.d s.d \
+ sample.d
diff --git a/doc/tools/src2html/Makefile.am b/doc/tools/src2html/Makefile.am
index 76d61c75ce..4fd0526138 100644
--- a/doc/tools/src2html/Makefile.am
+++ b/doc/tools/src2html/Makefile.am
@@ -6,9 +6,9 @@
# $Id$
#
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
-SRC2HTMLDIR=$(top_srcdir)/src2html1.4a
+SRC2HTMLDIR = $(top_srcdir)/src2html1.4a
ctags-wr: $(SRC2HTMLDIR)/ctags-wr
cp $< $@
diff --git a/doc/tools/src2html1.4a/Ctags/Makefile.am b/doc/tools/src2html1.4a/Ctags/Makefile.am
index 0066980147..09e4c45288 100644
--- a/doc/tools/src2html1.4a/Ctags/Makefile.am
+++ b/doc/tools/src2html1.4a/Ctags/Makefile.am
@@ -1,10 +1,10 @@
## $Id$
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
-noinst_PROGRAMS = ctags-new
+noinst_PROGRAMS = ctags-new
-ctags_new_SOURCES = C.c ctags.c fortran.c lisp.c print.c \
-tree.c yacc.c strerror.c ctags.h
+ctags_new_SOURCES = C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c \
+ strerror.c ctags.h
EXTRA_DIST = ctags.1 z.c
diff --git a/doc/tools/src2html1.4a/FreeBSD/Makefile.am b/doc/tools/src2html1.4a/FreeBSD/Makefile.am
index df56641ebe..0f65afc846 100644
--- a/doc/tools/src2html1.4a/FreeBSD/Makefile.am
+++ b/doc/tools/src2html1.4a/FreeBSD/Makefile.am
@@ -1,21 +1,7 @@
## $Id$
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
-EXTRA_DIST = \
-FreeBSD.hdr \
-FreeBSD.s2h \
-conf.hdr \
-ddb.hdr \
-i386.i386.hdr \
-i386.include.hdr \
-i386.isa.hdr \
-i386.stand.hdr \
-kern.hdr \
-net.hdr \
-netinet.hdr \
-nfs.hdr \
-stand.hdr \
-sys.hdr \
-ufs.hdr \
-vm.hdr
+EXTRA_DIST = FreeBSD.hdr FreeBSD.s2h conf.hdr ddb.hdr i386.i386.hdr \
+ i386.include.hdr i386.isa.hdr i386.stand.hdr kern.hdr net.hdr \
+ netinet.hdr nfs.hdr stand.hdr sys.hdr ufs.hdr vm.hdr
diff --git a/doc/tools/src2html1.4a/Makefile.am b/doc/tools/src2html1.4a/Makefile.am
index 8814866d6f..0bbb0a3e81 100644
--- a/doc/tools/src2html1.4a/Makefile.am
+++ b/doc/tools/src2html1.4a/Makefile.am
@@ -1,4 +1,5 @@
-AUTOMAKE_OPTIONS = foreign
+
+AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = Ctags FreeBSD ctags-emacs
diff --git a/doc/tools/src2html1.4a/ctags-emacs/Makefile.am b/doc/tools/src2html1.4a/ctags-emacs/Makefile.am
index 8c0c4a0ac5..ada38b2376 100644
--- a/doc/tools/src2html1.4a/ctags-emacs/Makefile.am
+++ b/doc/tools/src2html1.4a/ctags-emacs/Makefile.am
@@ -1,5 +1,5 @@
## $Id$
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
EXTRA_DIST = ctags etags.c-ada-patch README
diff --git a/doc/tools/texi2www/Makefile.am b/doc/tools/texi2www/Makefile.am
index 08b530df5f..47efd26ed9 100644
--- a/doc/tools/texi2www/Makefile.am
+++ b/doc/tools/texi2www/Makefile.am
@@ -6,19 +6,15 @@
# $Id$
#
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
noinst_SCRIPTS = texi2www texi2dvi
-EXTRA_DIST = \
-$(noinst_SCRIPTS) \
-dir-arrow.gif prev-arrow.gif \
-missing-arrow.gif up-arrow.gif \
-next-arrow.gif \
-texi2www.texi \
-archive/texi2www-960103.tgz
+EXTRA_DIST = $(noinst_SCRIPTS) dir-arrow.gif prev-arrow.gif \
+ missing-arrow.gif up-arrow.gif next-arrow.gif texi2www.texi \
+ archive/texi2www-960103.tgz
-PROJECT=texi2www
+PROJECT = texi2www
# TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
# info_TEXINFOS = texi2www.texi