Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

This patch addresses a few configuration issues and removes some
    duplicate configuration files.

    Background:
    * some files used in AC_INIT were not unique enough and can lead to
      problems if a user plays with configure scripts.
    * the Makefile templates are independent of the target/cpu and bsp, so
      the bsp dependent versions (c/src/make/Templates) are removed.

    To apply:
        patch -p1 < rtems-rc-19990820-3.diff
        rm -f c/src/make/Templates
        ./autogen

    ATTENTION: This patch removes several files and one directory :)
This commit is contained in:
Joel Sherrill
1999-08-30 16:25:54 +00:00
parent 473741bb07
commit f724a870c6
19 changed files with 50 additions and 463 deletions

2
c/configure vendored
View File

@@ -464,7 +464,7 @@ echo > confdefs.h
# A filename unique to this package, relative to the directory that
# configure is in, which we can look for to find out if srcdir is correct.
ac_unique_file=README
ac_unique_file=src
# Find the source files, if location was not specified.
if test -z "$srcdir"; then

View File

@@ -3,7 +3,7 @@ dnl
dnl $Id$
AC_PREREQ(2.13)
AC_INIT(README)
AC_INIT(src)
RTEMS_TOP(..)
AC_CONFIG_AUX_DIR(..)

2
c/src/configure vendored
View File

@@ -456,7 +456,7 @@ echo > confdefs.h
# A filename unique to this package, relative to the directory that
# configure is in, which we can look for to find out if srcdir is correct.
ac_unique_file=README
ac_unique_file=exec
# Find the source files, if location was not specified.
if test -z "$srcdir"; then

View File

@@ -3,7 +3,7 @@ dnl
dnl $Id$
AC_PREREQ(2.13)
AC_INIT(README)
AC_INIT(exec)
RTEMS_TOP(../..)
AC_CONFIG_AUX_DIR(../..)

View File

@@ -41,7 +41,7 @@ $(srcdir)/target.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/target.cfg.in
cp $< $@
endif
SUBDIRS = compilers custom Templates
SUBDIRS = compilers custom
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am

View File

@@ -152,7 +152,7 @@ rtems_bsp_makedir = $(rtems_bspdir)/make
rtems_bsp_make_DATA = bsp.cfg
SUBDIRS = compilers custom Templates
SUBDIRS = compilers custom
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs
CONFIG_CLEAN_FILES = Makefile.inc main.cfg host.cfg target.cfg bsp.cfg

View File

@@ -1,15 +0,0 @@
#
# $Id$
#
AUTOMAKE_OPTIONS = foreign 1.4
rtems_makedir=$(prefix)/make
rtems_make_Templatesdir=$(rtems_makedir)/Templates
rtems_make_Templates_DATA = \
Makefile.dir \
Makefile.leaf \
Makefile.lib
include $(top_srcdir)/../../../automake/local.am

View File

@@ -1,9 +0,0 @@
#
# $Id$
#
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/directory.cfg
SUB_DIRS=a b c your-directories-go-here

View File

@@ -1,279 +0,0 @@
# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
#
# $Id$
#
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
DESTDIR =
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_alias = @build_alias@
build_triplet = @build@
host_alias = @host_alias@
host_triplet = @host@
target_alias = @target_alias@
target_triplet = @target@
BARE_CPU_CFLAGS = @BARE_CPU_CFLAGS@
BARE_CPU_MODEL = @BARE_CPU_MODEL@
CAT = @CAT@
CC = @CC@
CC_CFLAGS_DEBUG_V = @CC_CFLAGS_DEBUG_V@
CC_CFLAGS_DEFAULT = @CC_CFLAGS_DEFAULT@
CC_CFLAGS_PROFILE_V = @CC_CFLAGS_PROFILE_V@
CC_FOR_TARGET = @CC_FOR_TARGET@
CC_LDFLAGS_PROFILE_V = @CC_LDFLAGS_PROFILE_V@
CHMOD = @CHMOD@
CMP = @CMP@
CP = @CP@
CPP = @CPP@
CUSTOM_CFG_FILES = @CUSTOM_CFG_FILES@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXX_FOR_TARGET = @CXX_FOR_TARGET@
GCCSED = @GCCSED@
HAS_CPLUSPLUS = @HAS_CPLUSPLUS@
HAS_MP = @HAS_MP@
HAS_NETWORKING = @HAS_NETWORKING@
HAS_POSIX_API = @HAS_POSIX_API@
HAS_RDBG = @HAS_RDBG@
INSTALL_CHANGE = @INSTALL_CHANGE@
KSH = @KSH@
LN = @LN@
LN_S = @LN_S@
M4 = @M4@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MV = @MV@
PACKAGE = @PACKAGE@
PACKHEX = @PACKHEX@
PERL = @PERL@
PROJECT_ROOT = @PROJECT_ROOT@
RM = @RM@
RTEMS_BSP = @RTEMS_BSP@
RTEMS_CPU = @RTEMS_CPU@
RTEMS_GAS_CODE16 = @RTEMS_GAS_CODE16@
RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@
RTEMS_HAS_MULTIPROCESSING = @RTEMS_HAS_MULTIPROCESSING@
RTEMS_HAS_NETWORKING = @RTEMS_HAS_NETWORKING@
RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@
RTEMS_HAS_RDBG = @RTEMS_HAS_RDBG@
RTEMS_HOST = @RTEMS_HOST@
RTEMS_LIBC_DIR = @RTEMS_LIBC_DIR@
RTEMS_ROOT = @RTEMS_ROOT@
RTEMS_TOPdir = @RTEMS_TOPdir@
RTEMS_USE_GCC272 = @RTEMS_USE_GCC272@
RTEMS_USE_MACROS = @RTEMS_USE_MACROS@
SED = @SED@
SORT = @SORT@
TOUCH = @TOUCH@
VERSION = @VERSION@
program_prefix = @program_prefix@
rtems_cv_prog_cc_cross = @rtems_cv_prog_cc_cross@
AUTOMAKE_OPTIONS = foreign 1.4
rtems_makedir = $(prefix)/make
rtems_make_Templatesdir = $(rtems_makedir)/Templates
rtems_make_Templates_DATA = Makefile.dir Makefile.leaf Makefile.lib
mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs
CONFIG_CLEAN_FILES =
DATA = $(rtems_make_Templates_DATA)
DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/../../../automake/local.am
cd $(top_srcdir) && $(AUTOMAKE) --foreign Templates/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
install-rtems_make_TemplatesDATA: $(rtems_make_Templates_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(rtems_make_Templatesdir)
@list='$(rtems_make_Templates_DATA)'; for p in $$list; do \
if test -f $(srcdir)/$$p; then \
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p"; \
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p; \
else if test -f $$p; then \
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p"; \
$(INSTALL_DATA) $$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p; \
fi; fi; \
done
uninstall-rtems_make_TemplatesDATA:
@$(NORMAL_UNINSTALL)
list='$(rtems_make_Templates_DATA)'; for p in $$list; do \
rm -f $(DESTDIR)$(rtems_make_Templatesdir)/$$p; \
done
tags: TAGS
TAGS:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = Templates
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Templates/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
info-am:
info: info-am
dvi-am:
dvi: dvi-am
check-am: all-am
check: check-am
installcheck-am:
installcheck: installcheck-am
install-exec-am:
install-exec: install-exec-am
install-data-am: install-rtems_make_TemplatesDATA
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am: uninstall-rtems_make_TemplatesDATA
uninstall: uninstall-am
all-am: Makefile $(DATA)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(rtems_make_Templatesdir)
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
mostlyclean-am: mostlyclean-generic
mostlyclean: mostlyclean-am
clean-am: clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-generic clean-am
distclean: distclean-am
maintainer-clean-am: maintainer-clean-generic distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
.PHONY: uninstall-rtems_make_TemplatesDATA \
install-rtems_make_TemplatesDATA tags distdir info-am info dvi-am dvi \
check check-am installcheck-am installcheck install-exec-am \
install-exec install-data-am install-data install-am install \
uninstall-am uninstall all-redirect all-am all installdirs \
mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
debug-am:
debug: debug-am
.PHONY: debug debug-am
profile-am:
profile: profile-am
.PHONY: profile profile-am
preinstall-am:
preinstall: preinstall-am
.PHONY: preinstall preinstall-am
depend-am:
depend: depend-am
.PHONY: depend depend-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@@ -1,77 +0,0 @@
#
# $Id$
#
# Templates/Makefile.leaf
# Template leaf node Makefile
#
# C source names, if any, go here -- minus the .c
C_PIECES=xxxd xxxe xxxf
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
# C++ source names, if any, go here -- minus the .cc
CC_PIECES=xxxa xxxb xxxc
CC_FILES=$(CC_PIECES:%=%.cc)
CC_O_FILES=$(CC_PIECES:%=${ARCH}/%.o)
H_FILES=
# Assembly source names, if any, go here -- minus the .S
S_PIECES=
S_FILES=$(S_PIECES:%=%.S)
S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
PGMS=${ARCH}/xxx-your-program-here ${ARCH}/xxx-another-one
# List of RTEMS managers to be included in the application goes here.
# Use:
# MANAGERS=all
# to include all RTEMS managers in the application.
MANAGERS=io event message rate_monotonic semaphore timer, etc.
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
#
# (OPTIONAL) Add local stuff here using +=
#
DEFINES +=
CPPFLAGS +=
CFLAGS +=
#
# CFLAGS_DEBUG_V are used when the `make debug' target is built.
# To link your application with the non-optimized RTEMS routines,
# uncomment the following line:
# CFLAGS_DEBUG_V += -qrtems_debug
#
LD_PATHS += xxx-your-EXTRA-library-paths-go-here, if any
LD_LIBS += xxx-your-libraries-go-here eg: -lvx
LDFLAGS +=
#
# Add your list of files to delete here. The config files
# already know how to delete some stuff, so you may want
# to just run 'make clean' first to see what gets missed.
# 'make clobber' already includes 'make clean'
#
CLEAN_ADDITIONS += xxx-your-debris-goes-here
CLOBBER_ADDITIONS +=
all: ${ARCH} $(SRCS) $(PGMS)
${ARCH}/xxx-your-program-here: ${OBJS} ${LINK_FILES}
$(make-exe)
# Install the program(s), appending _g or _p as appropriate.
# for include files, just use $(INSTALL_CHANGE)
install: all
$(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/bin

View File

@@ -1,59 +0,0 @@
#
# $Id$
#
# Templates/Makefile.lib
# Template library Makefile
#
LIBNAME=libfoo.a # xxx- your library names goes here
LIB=${ARCH}/${LIBNAME}
# C and C++ source names, if any, go here -- minus the .c or .cc
C_PIECES=xxxd xxxe xxxf
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
CC_PIECES=xxxa xxxb xxxc
CC_FILES=$(CC_PIECES:%=%.cc)
CC_O_FILES=$(CC_PIECES:%=${ARCH}/%.o)
H_FILES=
# Assembly source names, if any, go here -- minus the .S
S_PIECES=
S_FILES=$(S_PIECES:%=%.S)
S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
#
# Add local stuff here using +=
#
DEFINES +=
CPPFLAGS +=
CFLAGS +=
#
# Add your list of files to delete here. The config files
# already know how to delete some stuff, so you may want
# to just run 'make clean' first to see what gets missed.
# 'make clobber' already includes 'make clean'
#
CLEAN_ADDITIONS += xxx-your-debris-goes-here
CLOBBER_ADDITIONS +=
all: ${ARCH} $(SRCS) $(LIB)
$(LIB): ${OBJS}
$(make-library)
# Install the library, appending _g or _p as appropriate.
# for include files, just use $(INSTALL_CHANGE)
install: all
$(INSTALL_VARIANT) -m 644 ${LIB} ${PROJECT_RELEASE}/lib

View File

@@ -3141,7 +3141,6 @@ main.cfg
host.cfg
target.cfg
bsp.cfg
Templates/Makefile
custom/Makefile
custom/default.cfg
compilers/Makefile
@@ -3310,7 +3309,6 @@ main.cfg
host.cfg
target.cfg
bsp.cfg
Templates/Makefile
custom/Makefile
custom/default.cfg
compilers/Makefile

View File

@@ -125,7 +125,6 @@ main.cfg
host.cfg
target.cfg
bsp.cfg
Templates/Makefile
custom/Makefile
custom/default.cfg
compilers/Makefile

2
configure vendored
View File

@@ -479,7 +479,7 @@ echo > confdefs.h
# A filename unique to this package, relative to the directory that
# configure is in, which we can look for to find out if srcdir is correct.
ac_unique_file=README
ac_unique_file=c
# Find the source files, if location was not specified.
if test -z "$srcdir"; then

View File

@@ -4,7 +4,7 @@ dnl
dnl $Id$
AC_PREREQ(2.13)
AC_INIT(README)
AC_INIT(c)
RTEMS_TOP(.)
RTEMS_CANONICAL_TARGET_CPU

View File

@@ -4,7 +4,10 @@
AUTOMAKE_OPTIONS = foreign 1.4
EXTRA_DIST = \
rtems_makedir=$(prefix)/make
rtems_make_Templatesdir=$(rtems_makedir)/Templates
rtems_make_Templates_DATA = \
Makefile.dir \
Makefile.leaf \
Makefile.lib

View File

@@ -87,10 +87,15 @@ target_subdirs = @target_subdirs@
AUTOMAKE_OPTIONS = foreign 1.4
EXTRA_DIST = Makefile.dir Makefile.leaf Makefile.lib
rtems_makedir = $(prefix)/make
rtems_make_Templatesdir = $(rtems_makedir)/Templates
rtems_make_Templates_DATA = Makefile.dir Makefile.leaf Makefile.lib
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
DATA = $(rtems_make_Templates_DATA)
DIST_COMMON = Makefile.am Makefile.in
@@ -107,6 +112,25 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
install-rtems_make_TemplatesDATA: $(rtems_make_Templates_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(rtems_make_Templatesdir)
@list='$(rtems_make_Templates_DATA)'; for p in $$list; do \
if test -f $(srcdir)/$$p; then \
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p"; \
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p; \
else if test -f $$p; then \
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p"; \
$(INSTALL_DATA) $$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p; \
fi; fi; \
done
uninstall-rtems_make_TemplatesDATA:
@$(NORMAL_UNINSTALL)
list='$(rtems_make_Templates_DATA)'; for p in $$list; do \
rm -f $(DESTDIR)$(rtems_make_Templatesdir)/$$p; \
done
tags: TAGS
TAGS:
@@ -142,19 +166,20 @@ installcheck: installcheck-am
install-exec-am:
install-exec: install-exec-am
install-data-am:
install-data-am: install-rtems_make_TemplatesDATA
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am:
uninstall-am: uninstall-rtems_make_TemplatesDATA
uninstall: uninstall-am
all-am: Makefile
all-am: Makefile $(DATA)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(rtems_make_Templatesdir)
mostlyclean-generic:
@@ -184,12 +209,13 @@ maintainer-clean-am: maintainer-clean-generic distclean-am
maintainer-clean: maintainer-clean-am
.PHONY: tags distdir info-am info dvi-am dvi check check-am \
installcheck-am installcheck install-exec-am install-exec \
install-data-am install-data install-am install uninstall-am uninstall \
all-redirect all-am all installdirs mostlyclean-generic \
distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
.PHONY: uninstall-rtems_make_TemplatesDATA \
install-rtems_make_TemplatesDATA tags distdir info-am info dvi-am dvi \
check check-am installcheck-am installcheck install-exec-am \
install-exec install-data-am install-data install-am install \
uninstall-am uninstall all-redirect all-am all installdirs \
mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
debug-am:

View File

@@ -456,7 +456,7 @@ echo > confdefs.h
# A filename unique to this package, relative to the directory that
# configure is in, which we can look for to find out if srcdir is correct.
ac_unique_file=README
ac_unique_file=install-if-change.in
# Find the source files, if location was not specified.
if test -z "$srcdir"; then

View File

@@ -3,7 +3,7 @@
#
AC_PREREQ(2.13)
AC_INIT(README)
AC_INIT(install-if-change.in)
AC_CONFIG_AUX_DIR(../..)
RTEMS_TOP(../..)