summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-12-11 16:12:23 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-12-11 16:12:23 +0000
commiteec8e59e119017032a658f00396754cbb925d056 (patch)
treebbbeef33d230ec21a557e6e5ab1c4a1ffc101d35
parent5c58243c2b4f8352a8c67f52528dddb0a6b48155 (diff)
downloadrtems-eec8e59e119017032a658f00396754cbb925d056.tar.bz2
2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Cosmetics. * autotools/Makefile.am: Cosmetics. * autotools/autoconf-rtems.spec.in: 2.59. * autotools/automake-rtems.spec.in: 1.8, Require autoconf-2.59. * binutils/Makefile.am: Cosmetics. * cpukit/Makefile.am: Cosmetics. * gcc3newlib/Makefile.am: Cosmetics. * gccnewlib/Makefile.am: Cosmetics. * gdb/Makefile.am: Cosmetics. * rtems/Makefile.am: Cosmetics. * rtemsdoc/Makefile.am: Cosmetics.
Diffstat (limited to '')
-rw-r--r--scripts/ChangeLog14
-rw-r--r--scripts/Makefile.am5
-rw-r--r--scripts/autotools/Makefile.am4
-rw-r--r--scripts/autotools/autoconf-rtems.spec.in4
-rw-r--r--scripts/autotools/automake-rtems.spec.in10
-rw-r--r--scripts/binutils/Makefile.am3
-rw-r--r--scripts/cpukit/Makefile.am3
-rw-r--r--scripts/gcc3newlib/Makefile.am12
-rw-r--r--scripts/gccnewlib/Makefile.am17
-rw-r--r--scripts/gdb/Makefile.am5
-rw-r--r--scripts/rtems/Makefile.am6
-rw-r--r--scripts/rtemsdoc/Makefile.am33
12 files changed, 53 insertions, 63 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 43135e95f6..faee89b868 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,17 @@
+2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Cosmetics.
+ * autotools/Makefile.am: Cosmetics.
+ * autotools/autoconf-rtems.spec.in: 2.59.
+ * autotools/automake-rtems.spec.in: 1.8, Require autoconf-2.59.
+ * binutils/Makefile.am: Cosmetics.
+ * cpukit/Makefile.am: Cosmetics.
+ * gcc3newlib/Makefile.am: Cosmetics.
+ * gccnewlib/Makefile.am: Cosmetics.
+ * gdb/Makefile.am: Cosmetics.
+ * rtems/Makefile.am: Cosmetics.
+ * rtemsdoc/Makefile.am: Cosmetics.
+
2003-11-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* gcc3newlib/gccnewlib.add: Add hacks to make gnatlib
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 751f50a970..df7332d533 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -7,8 +7,8 @@ ACLOCAL_AMFLAGS = -I ../aclocal
SUBDIRS = . binutils gccnewlib gcc3newlib gdb rtems autotools cpukit
SUBDIRS += rtemsdoc
-noinst_SCRIPTS = setup buildall buildalltar mkbspspec \
- mkgccnewlibspec mkrpms mkspec
+noinst_SCRIPTS = setup buildall buildalltar mkbspspec mkgccnewlibspec mkrpms \
+ mkspec
noinst_DATA = setup.def
@@ -19,5 +19,6 @@ setup.cache: setup.def
cp setup.def $@
DISTCLEANFILES = setup.cache
+
include $(top_srcdir)/../automake/subdirs.am
include $(top_srcdir)/../automake/local.am
diff --git a/scripts/autotools/Makefile.am b/scripts/autotools/Makefile.am
index 2a75ae74e1..e6764afd31 100644
--- a/scripts/autotools/Makefile.am
+++ b/scripts/autotools/Makefile.am
@@ -2,8 +2,6 @@
## $Id$
##
-
-RPM_SPECS_DATA = \
- autoconf-rtems.spec automake-rtems.spec
+RPM_SPECS_DATA = autoconf-rtems.spec automake-rtems.spec
include $(top_srcdir)/../automake/local.am
diff --git a/scripts/autotools/autoconf-rtems.spec.in b/scripts/autotools/autoconf-rtems.spec.in
index 6e81bab2af..bd3df4e712 100644
--- a/scripts/autotools/autoconf-rtems.spec.in
+++ b/scripts/autotools/autoconf-rtems.spec.in
@@ -2,8 +2,8 @@
# spec file for autoconf
#
-%define rpmvers 2.57
-%define srcvers 2.57
+%define rpmvers 2.59
+%define srcvers 2.59
%define _defaultbuildroot %{_tmppath}/%{name}-%{srcvers}-root
%define _prefix @prefix@
diff --git a/scripts/autotools/automake-rtems.spec.in b/scripts/autotools/automake-rtems.spec.in
index d75fb51588..d6c401e96a 100644
--- a/scripts/autotools/automake-rtems.spec.in
+++ b/scripts/autotools/automake-rtems.spec.in
@@ -2,9 +2,9 @@
# spec file for automake
#
-%define rpmvers 1.7.8
-%define srcvers 1.7.8
-%define amvers 1.7
+%define rpmvers 1.8
+%define srcvers 1.8
+%define amvers 1.8
%define _defaultbuildroot %{_tmppath}/%{name}-%{srcvers}-root
%define _prefix @prefix@
@@ -12,12 +12,12 @@
%if "%{_prefix}" != "/usr"
%define name @rpmprefix@%{_name}-rtems
-%define requirements @rpmprefix@autoconf-rtems >= 2.54
+%define requirements @rpmprefix@autoconf-rtems >= 2.59
%define _infodir %{_prefix}/info
%define _mandir %{_prefix}/man
%else
%define name %{_name}
-%define requirements autoconf >= 2.54
+%define requirements autoconf >= 2.59
%endif
Vendor: http://www.rtems.com
diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am
index 988fc6d0db..2115670f5c 100644
--- a/scripts/binutils/Makefile.am
+++ b/scripts/binutils/Makefile.am
@@ -16,8 +16,7 @@ binutils.spec.in: $(SUBPACKAGES)
CLEANFILES = binutils.spec.in
RPM_SPECS_DATA =
-MKBINUTILSSPEC_DEPS = mkspec binutils.spec.in \
- $(top_builddir)/setup.cache
+MKBINUTILSSPEC_DEPS = mkspec binutils.spec.in $(top_builddir)/setup.cache
arm-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache arm-rtems@osversion@ > $@
diff --git a/scripts/cpukit/Makefile.am b/scripts/cpukit/Makefile.am
index 29a82707d2..01d1e00bc5 100644
--- a/scripts/cpukit/Makefile.am
+++ b/scripts/cpukit/Makefile.am
@@ -12,8 +12,7 @@ SUBPACKAGES += rtems-cpukit.add
SUBPACKAGES += $(top_builddir)/common/clean.add
SUBPACKAGES += target-cpukit.add
-MKSPEC_DEPS = mkspec rtems-cpukit.spec.in \
- $(top_builddir)/setup.cache
+MKSPEC_DEPS = mkspec rtems-cpukit.spec.in $(top_builddir)/setup.cache
rtems-cpukit.spec.in: $(SUBPACKAGES)
cat $^ > $@
diff --git a/scripts/gcc3newlib/Makefile.am b/scripts/gcc3newlib/Makefile.am
index e838f231f9..cc03bc57e9 100644
--- a/scripts/gcc3newlib/Makefile.am
+++ b/scripts/gcc3newlib/Makefile.am
@@ -10,12 +10,9 @@ SUBPACKAGES = header.add
SUBPACKAGES += $(top_builddir)/common/common.add
SUBPACKAGES += gccnewlib.add
SUBPACKAGES += $(top_builddir)/common/clean.add
-SUBPACKAGES += base-gcc.add target-gcc.add \
- base-g77.add target-g77.add \
- base-gcj.add target-gcj.add \
- target-objc.add \
- target-c++.add \
- base-gnat.add target-gnat.add
+SUBPACKAGES += base-gcc.add target-gcc.add base-g77.add target-g77.add \
+ base-gcj.add target-gcj.add target-objc.add target-c++.add base-gnat.add \
+ target-gnat.add
noinst_DATA = gccnewlib.spec.in
@@ -23,8 +20,7 @@ gccnewlib.spec.in: $(SUBPACKAGES)
cat $^ > $@
CLEANFILES = gccnewlib.spec.in
-MKGCCNEWLIBSPEC_DEPS = mkspec gccnewlib.spec.in \
- $(top_builddir)/setup.cache
+MKGCCNEWLIBSPEC_DEPS = mkspec gccnewlib.spec.in $(top_builddir)/setup.cache
RPM_SPECS_DATA =
diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am
index 9c44c1d0ce..e7e90578b1 100644
--- a/scripts/gccnewlib/Makefile.am
+++ b/scripts/gccnewlib/Makefile.am
@@ -10,11 +10,8 @@ SUBPACKAGES = header.add
SUBPACKAGES += ../common/common.add
SUBPACKAGES += gccnewlib.add
SUBPACKAGES += ../common/clean.add
-SUBPACKAGES += base-gcc.add target-gcc.add \
- base-chill.add target-chill.add \
- base-g77.add target-g77.add \
- base-gcj.add target-gcj.add \
- target-objc.add
+SUBPACKAGES += base-gcc.add target-gcc.add base-chill.add target-chill.add \
+ base-g77.add target-g77.add base-gcj.add target-gcj.add target-objc.add
gccnewlib.spec.in: $(SUBPACKAGES)
cat $^ \
@@ -70,13 +67,11 @@ sh-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
-RPM_SPECS_DATA = \
- arm-rtems-$(GCCNEWLIBVERS).spec \
- c4x-rtems-$(GCCNEWLIBVERS).spec \
- h8300-rtems-$(GCCNEWLIBVERS).spec \
+RPM_SPECS_DATA = arm-rtems-$(GCCNEWLIBVERS).spec \
+ c4x-rtems-$(GCCNEWLIBVERS).spec h8300-rtems-$(GCCNEWLIBVERS).spec \
i386-rtems-$(GCCNEWLIBVERS).spec i960-rtems-$(GCCNEWLIBVERS).spec \
- m68k-rtems-$(GCCNEWLIBVERS).spec \
- mips-rtems-$(GCCNEWLIBVERS).spec mips64orion-rtems-$(GCCNEWLIBVERS).spec \
+ m68k-rtems-$(GCCNEWLIBVERS).spec mips-rtems-$(GCCNEWLIBVERS).spec \
+ mips64orion-rtems-$(GCCNEWLIBVERS).spec \
powerpc-rtems-$(GCCNEWLIBVERS).spec sh-rtems-$(GCCNEWLIBVERS).spec \
sh-rtemself-$(GCCNEWLIBVERS).spec sparc-rtems-$(GCCNEWLIBVERS).spec
CLEANFILES += $(RPM_SPECS_DATA)
diff --git a/scripts/gdb/Makefile.am b/scripts/gdb/Makefile.am
index 52a0320054..cf3253028b 100644
--- a/scripts/gdb/Makefile.am
+++ b/scripts/gdb/Makefile.am
@@ -18,10 +18,9 @@ gdb.spec.in: $(SUBPACKAGES)
cat $^ > $@
CLEANFILES = gdb.spec.in
-MKGDBSPEC_DEPS = mkspec gdb.spec.in \
- $(top_builddir)/setup.cache
+MKGDBSPEC_DEPS = mkspec gdb.spec.in $(top_builddir)/setup.cache
-RPM_SPECS_DATA =
+RPM_SPECS_DATA =
arm-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
$(MKSPEC) -cfg $(top_builddir)/setup.cache arm-rtems@osversion@ > $@
diff --git a/scripts/rtems/Makefile.am b/scripts/rtems/Makefile.am
index 76fb8ff81f..83483dd940 100644
--- a/scripts/rtems/Makefile.am
+++ b/scripts/rtems/Makefile.am
@@ -35,9 +35,8 @@ sparc-rtems-erc32-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
TEMPLATES = rtems.spec.in
-RPM_SPECS_DATA = \
- i386-rtems-pc386-$(BSPVERS).spec i960-rtems-cvme961-$(BSPVERS).spec \
- m68k-rtems-gen68360-$(BSPVERS).spec \
+RPM_SPECS_DATA = i386-rtems-pc386-$(BSPVERS).spec \
+ i960-rtems-cvme961-$(BSPVERS).spec m68k-rtems-gen68360-$(BSPVERS).spec \
mips64orion-rtems-p4600-$(BSPVERS).spec \
powerpc-rtems-mcp750-$(BSPVERS).spec sh-rtems-gensh1-$(BSPVERS).spec \
sh-rtemself-gensh1-$(BSPVERS).spec sparc-rtems-erc32-$(BSPVERS).spec
@@ -47,4 +46,5 @@ noinst_DATA = $(TEMPLATES)
EXTRA_DIST = $(TEMPLATES)
CLEANFILES = $(RPM_SPECS_DATA)
+
include $(top_srcdir)/../automake/local.am
diff --git a/scripts/rtemsdoc/Makefile.am b/scripts/rtemsdoc/Makefile.am
index a159833aae..abcdc9d0a6 100644
--- a/scripts/rtemsdoc/Makefile.am
+++ b/scripts/rtemsdoc/Makefile.am
@@ -8,26 +8,15 @@ CLEANFILES =
MKSPEC = $(SHELL) ./mkspec
-MKSPEC_DEPS = mkspec rtemsdoc.spec.in \
- $(top_builddir)/setup.cache
-
-SUPPLEMENTS = \
- arm \
- c4x \
- i386 \
- i960 \
- m68k \
- mips \
- mips64orion \
- powerpc \
- sh \
- sparc
-
-DOCS = ada_user posix1003_1 bsp_howto
+MKSPEC_DEPS = mkspec rtemsdoc.spec.in $(top_builddir)/setup.cache
+
+SUPPLEMENTS = arm c4x i386 i960 m68k mips mips64orion powerpc sh sparc
+
+DOCS = ada_user posix1003_1 bsp_howto
DOCS += c_user
-DOCS += develenv
+DOCS += develenv
DOCS += FAQ filesystem itron
-DOCS += networking porting new_chapters
+DOCS += networking porting new_chapters
DOCS += relnotes rgdb_specs rtems_gdb
DOCS += started started_ada
@@ -36,19 +25,19 @@ SUBPACKAGES += ../common/common.add
SUBPACKAGES += rtemsdoc.add
SUBPACKAGES += ../common/clean.add
SUBPACKAGES += $(DOCS:%=%-docs.add)
-CLEANFILES += $(DOCS:%=%-docs.add)
+CLEANFILES += $(DOCS:%=%-docs.add)
SUBPACKAGES += $(SUPPLEMENTS:%=%-supplement.add)
-CLEANFILES += $(SUPPLEMENTS:%=%-supplement.add)
+CLEANFILES += $(SUPPLEMENTS:%=%-supplement.add)
SUFFIXES = -supplement.add -docs.add
%-supplement.add: supplement.add.in
t=`echo $@ | sed -e 's,-supplement.add,,'`; \
- sed -e s/@target\@/$$t/g < $< >$@
+ sed -e s/@target\@/$$t/g < $< >$@
%-docs.add: templ.add.in
t=`echo $@ | sed -e 's,-docs.add,,'`; \
- sed -e s/@target\@/$$t/g < $< >$@
+ sed -e s/@target\@/$$t/g < $< >$@
rtemsdoc.spec.in: $(SUBPACKAGES)
cat $^ > $@