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.
This commit is contained in:
Ralf Corsepius
2003-12-11 16:12:23 +00:00
parent 5c58243c2b
commit eec8e59e11
12 changed files with 51 additions and 61 deletions

View File

@@ -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> 2003-11-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* gcc3newlib/gccnewlib.add: Add hacks to make gnatlib * gcc3newlib/gccnewlib.add: Add hacks to make gnatlib

View File

@@ -7,8 +7,8 @@ ACLOCAL_AMFLAGS = -I ../aclocal
SUBDIRS = . binutils gccnewlib gcc3newlib gdb rtems autotools cpukit SUBDIRS = . binutils gccnewlib gcc3newlib gdb rtems autotools cpukit
SUBDIRS += rtemsdoc SUBDIRS += rtemsdoc
noinst_SCRIPTS = setup buildall buildalltar mkbspspec \ noinst_SCRIPTS = setup buildall buildalltar mkbspspec mkgccnewlibspec mkrpms \
mkgccnewlibspec mkrpms mkspec mkspec
noinst_DATA = setup.def noinst_DATA = setup.def
@@ -19,5 +19,6 @@ setup.cache: setup.def
cp setup.def $@ cp setup.def $@
DISTCLEANFILES = setup.cache DISTCLEANFILES = setup.cache
include $(top_srcdir)/../automake/subdirs.am include $(top_srcdir)/../automake/subdirs.am
include $(top_srcdir)/../automake/local.am include $(top_srcdir)/../automake/local.am

View File

@@ -2,8 +2,6 @@
## $Id$ ## $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 include $(top_srcdir)/../automake/local.am

View File

@@ -2,8 +2,8 @@
# spec file for autoconf # spec file for autoconf
# #
%define rpmvers 2.57 %define rpmvers 2.59
%define srcvers 2.57 %define srcvers 2.59
%define _defaultbuildroot %{_tmppath}/%{name}-%{srcvers}-root %define _defaultbuildroot %{_tmppath}/%{name}-%{srcvers}-root
%define _prefix @prefix@ %define _prefix @prefix@

View File

@@ -2,9 +2,9 @@
# spec file for automake # spec file for automake
# #
%define rpmvers 1.7.8 %define rpmvers 1.8
%define srcvers 1.7.8 %define srcvers 1.8
%define amvers 1.7 %define amvers 1.8
%define _defaultbuildroot %{_tmppath}/%{name}-%{srcvers}-root %define _defaultbuildroot %{_tmppath}/%{name}-%{srcvers}-root
%define _prefix @prefix@ %define _prefix @prefix@
@@ -12,12 +12,12 @@
%if "%{_prefix}" != "/usr" %if "%{_prefix}" != "/usr"
%define name @rpmprefix@%{_name}-rtems %define name @rpmprefix@%{_name}-rtems
%define requirements @rpmprefix@autoconf-rtems >= 2.54 %define requirements @rpmprefix@autoconf-rtems >= 2.59
%define _infodir %{_prefix}/info %define _infodir %{_prefix}/info
%define _mandir %{_prefix}/man %define _mandir %{_prefix}/man
%else %else
%define name %{_name} %define name %{_name}
%define requirements autoconf >= 2.54 %define requirements autoconf >= 2.59
%endif %endif
Vendor: http://www.rtems.com Vendor: http://www.rtems.com

View File

@@ -16,8 +16,7 @@ binutils.spec.in: $(SUBPACKAGES)
CLEANFILES = binutils.spec.in CLEANFILES = binutils.spec.in
RPM_SPECS_DATA = RPM_SPECS_DATA =
MKBINUTILSSPEC_DEPS = mkspec binutils.spec.in \ MKBINUTILSSPEC_DEPS = mkspec binutils.spec.in $(top_builddir)/setup.cache
$(top_builddir)/setup.cache
arm-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) arm-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache arm-rtems@osversion@ > $@ $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache arm-rtems@osversion@ > $@

View File

@@ -12,8 +12,7 @@ SUBPACKAGES += rtems-cpukit.add
SUBPACKAGES += $(top_builddir)/common/clean.add SUBPACKAGES += $(top_builddir)/common/clean.add
SUBPACKAGES += target-cpukit.add SUBPACKAGES += target-cpukit.add
MKSPEC_DEPS = mkspec rtems-cpukit.spec.in \ MKSPEC_DEPS = mkspec rtems-cpukit.spec.in $(top_builddir)/setup.cache
$(top_builddir)/setup.cache
rtems-cpukit.spec.in: $(SUBPACKAGES) rtems-cpukit.spec.in: $(SUBPACKAGES)
cat $^ > $@ cat $^ > $@

View File

@@ -10,12 +10,9 @@ SUBPACKAGES = header.add
SUBPACKAGES += $(top_builddir)/common/common.add SUBPACKAGES += $(top_builddir)/common/common.add
SUBPACKAGES += gccnewlib.add SUBPACKAGES += gccnewlib.add
SUBPACKAGES += $(top_builddir)/common/clean.add SUBPACKAGES += $(top_builddir)/common/clean.add
SUBPACKAGES += base-gcc.add target-gcc.add \ SUBPACKAGES += base-gcc.add target-gcc.add base-g77.add target-g77.add \
base-g77.add target-g77.add \ base-gcj.add target-gcj.add target-objc.add target-c++.add base-gnat.add \
base-gcj.add target-gcj.add \ target-gnat.add
target-objc.add \
target-c++.add \
base-gnat.add target-gnat.add
noinst_DATA = gccnewlib.spec.in noinst_DATA = gccnewlib.spec.in
@@ -23,8 +20,7 @@ gccnewlib.spec.in: $(SUBPACKAGES)
cat $^ > $@ cat $^ > $@
CLEANFILES = gccnewlib.spec.in CLEANFILES = gccnewlib.spec.in
MKGCCNEWLIBSPEC_DEPS = mkspec gccnewlib.spec.in \ MKGCCNEWLIBSPEC_DEPS = mkspec gccnewlib.spec.in $(top_builddir)/setup.cache
$(top_builddir)/setup.cache
RPM_SPECS_DATA = RPM_SPECS_DATA =

View File

@@ -10,11 +10,8 @@ SUBPACKAGES = header.add
SUBPACKAGES += ../common/common.add SUBPACKAGES += ../common/common.add
SUBPACKAGES += gccnewlib.add SUBPACKAGES += gccnewlib.add
SUBPACKAGES += ../common/clean.add SUBPACKAGES += ../common/clean.add
SUBPACKAGES += base-gcc.add target-gcc.add \ SUBPACKAGES += base-gcc.add target-gcc.add base-chill.add target-chill.add \
base-chill.add target-chill.add \ base-g77.add target-g77.add base-gcj.add target-gcj.add target-objc.add
base-g77.add target-g77.add \
base-gcj.add target-gcj.add \
target-objc.add
gccnewlib.spec.in: $(SUBPACKAGES) gccnewlib.spec.in: $(SUBPACKAGES)
cat $^ \ cat $^ \
@@ -70,13 +67,11 @@ sh-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS)
$(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
RPM_SPECS_DATA = \ RPM_SPECS_DATA = arm-rtems-$(GCCNEWLIBVERS).spec \
arm-rtems-$(GCCNEWLIBVERS).spec \ c4x-rtems-$(GCCNEWLIBVERS).spec h8300-rtems-$(GCCNEWLIBVERS).spec \
c4x-rtems-$(GCCNEWLIBVERS).spec \
h8300-rtems-$(GCCNEWLIBVERS).spec \
i386-rtems-$(GCCNEWLIBVERS).spec i960-rtems-$(GCCNEWLIBVERS).spec \ i386-rtems-$(GCCNEWLIBVERS).spec i960-rtems-$(GCCNEWLIBVERS).spec \
m68k-rtems-$(GCCNEWLIBVERS).spec \ m68k-rtems-$(GCCNEWLIBVERS).spec mips-rtems-$(GCCNEWLIBVERS).spec \
mips-rtems-$(GCCNEWLIBVERS).spec mips64orion-rtems-$(GCCNEWLIBVERS).spec \ mips64orion-rtems-$(GCCNEWLIBVERS).spec \
powerpc-rtems-$(GCCNEWLIBVERS).spec sh-rtems-$(GCCNEWLIBVERS).spec \ powerpc-rtems-$(GCCNEWLIBVERS).spec sh-rtems-$(GCCNEWLIBVERS).spec \
sh-rtemself-$(GCCNEWLIBVERS).spec sparc-rtems-$(GCCNEWLIBVERS).spec sh-rtemself-$(GCCNEWLIBVERS).spec sparc-rtems-$(GCCNEWLIBVERS).spec
CLEANFILES += $(RPM_SPECS_DATA) CLEANFILES += $(RPM_SPECS_DATA)

View File

@@ -18,8 +18,7 @@ gdb.spec.in: $(SUBPACKAGES)
cat $^ > $@ cat $^ > $@
CLEANFILES = gdb.spec.in CLEANFILES = gdb.spec.in
MKGDBSPEC_DEPS = mkspec gdb.spec.in \ MKGDBSPEC_DEPS = mkspec gdb.spec.in $(top_builddir)/setup.cache
$(top_builddir)/setup.cache
RPM_SPECS_DATA = RPM_SPECS_DATA =

View File

@@ -35,9 +35,8 @@ sparc-rtems-erc32-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
TEMPLATES = rtems.spec.in TEMPLATES = rtems.spec.in
RPM_SPECS_DATA = \ RPM_SPECS_DATA = i386-rtems-pc386-$(BSPVERS).spec \
i386-rtems-pc386-$(BSPVERS).spec i960-rtems-cvme961-$(BSPVERS).spec \ i960-rtems-cvme961-$(BSPVERS).spec m68k-rtems-gen68360-$(BSPVERS).spec \
m68k-rtems-gen68360-$(BSPVERS).spec \
mips64orion-rtems-p4600-$(BSPVERS).spec \ mips64orion-rtems-p4600-$(BSPVERS).spec \
powerpc-rtems-mcp750-$(BSPVERS).spec sh-rtems-gensh1-$(BSPVERS).spec \ powerpc-rtems-mcp750-$(BSPVERS).spec sh-rtems-gensh1-$(BSPVERS).spec \
sh-rtemself-gensh1-$(BSPVERS).spec sparc-rtems-erc32-$(BSPVERS).spec sh-rtemself-gensh1-$(BSPVERS).spec sparc-rtems-erc32-$(BSPVERS).spec
@@ -47,4 +46,5 @@ noinst_DATA = $(TEMPLATES)
EXTRA_DIST = $(TEMPLATES) EXTRA_DIST = $(TEMPLATES)
CLEANFILES = $(RPM_SPECS_DATA) CLEANFILES = $(RPM_SPECS_DATA)
include $(top_srcdir)/../automake/local.am include $(top_srcdir)/../automake/local.am

View File

@@ -8,20 +8,9 @@ CLEANFILES =
MKSPEC = $(SHELL) ./mkspec MKSPEC = $(SHELL) ./mkspec
MKSPEC_DEPS = mkspec rtemsdoc.spec.in \ MKSPEC_DEPS = mkspec rtemsdoc.spec.in $(top_builddir)/setup.cache
$(top_builddir)/setup.cache
SUPPLEMENTS = \ SUPPLEMENTS = arm c4x i386 i960 m68k mips mips64orion powerpc sh sparc
arm \
c4x \
i386 \
i960 \
m68k \
mips \
mips64orion \
powerpc \
sh \
sparc
DOCS = ada_user posix1003_1 bsp_howto DOCS = ada_user posix1003_1 bsp_howto
DOCS += c_user DOCS += c_user