summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/Makefile.in445
-rw-r--r--make/custom/FreeBSD-posix.cfg3
-rw-r--r--make/custom/Linux-posix.cfg3
-rw-r--r--make/custom/Solaris-posix.cfg3
-rw-r--r--make/custom/default.cfg8
-rw-r--r--make/custom/gensh1.cfg2
-rw-r--r--make/custom/no_bsp.cfg4
-rw-r--r--make/custom/portsw.cfg4
-rw-r--r--make/custom/posix.cfg7
-rw-r--r--make/custom/simhppa.cfg3
-rw-r--r--make/directory.cfg7
-rw-r--r--make/host.cfg.in20
-rw-r--r--make/leaf.cfg3
-rw-r--r--make/main.cfg9
-rw-r--r--make/target.cfg.in2
15 files changed, 398 insertions, 125 deletions
diff --git a/make/Makefile.in b/make/Makefile.in
index 5d420d6c39..652737519e 100644
--- a/make/Makefile.in
+++ b/make/Makefile.in
@@ -1,103 +1,408 @@
+# 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$
-#
-# Not strictly necessary to pull in this stuff. But it helps with
-# working with the templates and poking around.
+# $Id$
#
-@SET_MAKE@
+
+
+
+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 = ..
-subdir = make
+
+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@
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+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@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
+RTEMS_CPU = @RTEMS_CPU@
+RTEMS_HAS_HWAPI = @RTEMS_HAS_HWAPI@
+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_TOPdir = @RTEMS_TOPdir@
+RTEMS_USE_MACROS = @RTEMS_USE_MACROS@
+TARGET_SUBDIRS = @TARGET_SUBDIRS@
+VERSION = @VERSION@
+target_subdirs = @target_subdirs@
-VPATH = @srcdir@
+AUTOMAKE_OPTIONS = foreign 1.4
+
+rtems_makedir = $(prefix)/make
+
+rtems_make_DATA = main.cfg
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
+EXTRA_DIST = README directory.cfg host.cfg.in leaf.cfg lib.cfg target.cfg.in
-# NOTE: No need to prepend $(srcdir) to file names,
-# VPATH handles the paths for us.
-# NOTE: Only the files really need get installed.
-GENERIC_FILES := host.cfg target.cfg
+SUBDIRS = Templates custom compilers
-MAKEFILES := README \
- directory.cfg leaf.cfg \
- lib.cfg main.cfg
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES =
+DATA = $(rtems_make_DATA)
-# NOTE: Use the wildcard rule to install all custom files
-# CUSTOM_FILES := $(wildcard $(srcdir)/custom/*.cfg)
+DIST_COMMON = README Makefile.am Makefile.in
-# NOTE: This should be sufficient, but may fail for some BSPS:
-# Get all custom files for the BSP family, they may depend on each other
-#CUSTOM_FILES := custom/default.cfg $(patsubst %,custom/%.cfg, posix)
-# This version of the rule is pretty ugly but I think it works ALL the time.
-# + Figure out what this BSP.cfg includes
-# + Make those files have the correct relative path.
-# + Now fix $(RTEMS_HOST) to the real host name
-CUSTOM_FILES := custom/default.cfg custom/${RTEMS_BSP}.cfg \
- $(shell grep "^include.*make/custom" $(srcdir)/custom/${RTEMS_BSP}.cfg | \
- sed -e 's/^.*make\///' | sed -e s/\\$$\(RTEMS_HOST\)/${RTEMS_HOST}/)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-# NOTE: Use the wildcard rule to install all compiler files
-# COMPILER_FILES := $(wildcard $(srcdir)/compilers/*.cfg)
-COMPILER_FILES := $(CONFIG.$(TARGET_ARCH).CC) $(CONFIG.$(HOST_ARCH).CC)
+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/subdirs.am $(top_srcdir)/automake/local.am
+ cd $(top_srcdir) && $(AUTOMAKE) --foreign make/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-# NOTE: Don't use a wildcard rule here, otherwise Templates/Makefile.inc
-# will be installed, too
-TEMPLATE_FILES := \
- Templates/Makefile.dir \
- Templates/Makefile.leaf \
- Templates/Makefile.lib
-get: retrieve
+install-rtems_makeDATA: $(rtems_make_DATA)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(rtems_makedir)
+ @list='$(rtems_make_DATA)'; for p in $$list; do \
+ if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rtems_makedir)/$$p"; \
+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rtems_makedir)/$$p; \
+ else if test -f $$p; then \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(rtems_makedir)/$$p"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(rtems_makedir)/$$p; \
+ fi; fi; \
+ done
-all:
+uninstall-rtems_makeDATA:
+ @$(NORMAL_UNINSTALL)
+ list='$(rtems_make_DATA)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(rtems_makedir)/$$p; \
+ done
-$(prefix):
- @top_srcdir@/mkinstalldirs $@
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
-install: $(prefix) \
- $(prefix)/make \
- $(prefix)/make/compilers \
- $(prefix)/make/custom \
- $(prefix)/make/Templates \
- install_files
+@SET_MAKE@
-$(prefix)/make:
- @top_srcdir@/mkinstalldirs $@
+all-recursive install-data-recursive install-exec-recursive \
+installdirs-recursive install-recursive uninstall-recursive \
+check-recursive installcheck-recursive info-recursive dvi-recursive:
+ @set fnord $(MAKEFLAGS); amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
-install_files:: $(GENERIC_FILES) $(MAKEFILES)
- $(INSTALL_DATA) $^ $(prefix)/make
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @set fnord $(MAKEFLAGS); amf=$$2; \
+ dot_seen=no; \
+ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+ rev="$$subdir $$rev"; \
+ test "$$subdir" = "." && dot_seen=yes; \
+ done; \
+ test "$$dot_seen" = "no" && rev=". $$rev"; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
-$(prefix)/make/compilers:
- @top_srcdir@/mkinstalldirs $@
+tags: TAGS
-install_files:: $(COMPILER_FILES)
- $(INSTALL_DATA) $^ $(prefix)/make/compilers
+ID: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ here=`pwd` && cd $(srcdir) \
+ && mkid -f$$here/ID $$unique $(LISP)
-$(prefix)/make/custom:
- @top_srcdir@/mkinstalldirs $@
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
-install_files:: $(CUSTOM_FILES)
- $(INSTALL_DATA) $^ $(prefix)/make/custom
+mostlyclean-tags:
-$(prefix)/make/Templates:
- @top_srcdir@/mkinstalldirs $@
+clean-tags:
-install_files:: $(TEMPLATE_FILES)
- $(INSTALL_DATA) $^ $(prefix)/make/Templates
+distclean-tags:
+ -rm -f TAGS ID
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = make
+
+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 make/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
+ for subdir in $(SUBDIRS); do \
+ if test "$$subdir" = .; then :; else \
+ test -d $(distdir)/$$subdir \
+ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+ chmod 777 $(distdir)/$$subdir; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+ || exit 1; \
+ fi; \
+ done
+info-am:
+info: info-recursive
+dvi-am:
+dvi: dvi-recursive
+check-am: all-am
+check: check-recursive
+installcheck-am:
+installcheck: installcheck-recursive
+install-exec-am:
+install-exec: install-exec-recursive
+
+install-data-am: install-rtems_makeDATA
+install-data: install-data-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-recursive
+uninstall-am: uninstall-rtems_makeDATA
+uninstall: uninstall-recursive
+all-am: Makefile $(DATA)
+all-redirect: all-recursive
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs: installdirs-recursive
+installdirs-am:
+ $(mkinstalldirs) $(DESTDIR)$(rtems_makedir)
+
+
+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-tags mostlyclean-generic
+
+mostlyclean: mostlyclean-recursive
+
+clean-am: clean-tags clean-generic mostlyclean-am
+
+clean: clean-recursive
+
+distclean-am: distclean-tags distclean-generic clean-am
+
+distclean: distclean-recursive
+
+maintainer-clean-am: maintainer-clean-tags 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-recursive
+
+.PHONY: uninstall-rtems_makeDATA install-rtems_makeDATA \
+install-data-recursive uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-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-am \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+depend-recursive \
+clobber-recursive \
+preinstall-recursive \
+debug-recursive \
+debug_install-recursive \
+profile-recursive \
+profile_install-recursive:
+ @set fnord $(MAKEFLAGS); amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+debug: debug-recursive
+.PHONY: debug-recursive
+
+debug_install: debug_install-recursive
+.PHONY: debug_install-recursive
+
+profile: profile-recursive
+.PHONY: profile-recursive
+
+profile_install: profile_install-recursive
+.PHONY: profile-recursive
+
+preinstall: preinstall-recursive
+.PHONY: preinstall-recursive
+
+clobber: clobber-recursive
+.PHONY: clobber-recursive
+
+depend: depend-recursive
+.PHONY: depend-recursive
+
+debug-am:
+debug: debug-am
+.PHONY: debug debug-am
+
+debug_install-am:
+debug_install: debug_install-am
+.PHONY: debug_install debug_install-am
+
+profile-am:
+profile: profile-am
+.PHONY: profile profile-am
+
+profile_install-am:
+profile_install: profile_install-am
+.PHONY: profile_install profile_install-am
+
+preinstall-am:
+preinstall: preinstall-am
+.PHONY: preinstall preinstall-am
+
+clobber-am:
+clobber: clobber-am
+.PHONY: clobber clobber-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:
diff --git a/make/custom/FreeBSD-posix.cfg b/make/custom/FreeBSD-posix.cfg
index 92aa9c5c8d..bae94800df 100644
--- a/make/custom/FreeBSD-posix.cfg
+++ b/make/custom/FreeBSD-posix.cfg
@@ -14,9 +14,6 @@ TARGET_ARCH=o-freebsd2
include $(RTEMS_ROOT)/make/custom/default.cfg
-# DO NOT Use the LIBC support for CYGNUS newlib
-RTEMS_USE_NEWLIB=no
-
# RTEMS_LIBC_DIR must already be set (by configuration) DOES NOT MATTER
LIBC_DEFINES =-D_POSIX_C_SOURCE
LIBC_DEFINES+=-DRTEMS_UNIXLIB -DRTEMS_UNIX -DMALLOC_PROVIDED -DRTEMS_DEBUG
diff --git a/make/custom/Linux-posix.cfg b/make/custom/Linux-posix.cfg
index 50c9b509a6..6768b36590 100644
--- a/make/custom/Linux-posix.cfg
+++ b/make/custom/Linux-posix.cfg
@@ -15,9 +15,6 @@ TARGET_ARCH=o-linux1
include $(RTEMS_ROOT)/make/custom/default.cfg
-# DO NOT Use the LIBC support for CYGNUS newlib
-RTEMS_USE_NEWLIB=no
-
# RTEMS_LIBC_DIR must already be set (by configuration) DOES NOT MATTER
LIBC_DEFINES =-D_POSIX_C_SOURCE
LIBC_DEFINES+=-DRTEMS_UNIXLIB -DRTEMS_UNIX -DMALLOC_PROVIDED -DRTEMS_DEBUG
diff --git a/make/custom/Solaris-posix.cfg b/make/custom/Solaris-posix.cfg
index 646f79a0f6..23043ebd1b 100644
--- a/make/custom/Solaris-posix.cfg
+++ b/make/custom/Solaris-posix.cfg
@@ -15,9 +15,6 @@ TARGET_ARCH=o-solaris2
include $(RTEMS_ROOT)/make/custom/default.cfg
-# DO NOT Use the LIBC support for CYGNUS newlib
-RTEMS_USE_NEWLIB=no
-
# The following define the memory reserved in the executable for the
# RTEMS Workspace and the C Program Heap.
LIBC_DEFINES += -DWORKSPACE_MB=2
diff --git a/make/custom/default.cfg b/make/custom/default.cfg
index d8c56518d2..7aa56c646f 100644
--- a/make/custom/default.cfg
+++ b/make/custom/default.cfg
@@ -8,8 +8,8 @@
# $Id$
#
-include $(PROJECT_ROOT)/make/target.cfg
-include $(PROJECT_ROOT)/make/host.cfg
+include $(RTEMS_ROOT)/make/target.cfg
+include $(RTEMS_ROOT)/make/host.cfg
# Specify here the host and target "architectures"
HOST_ARCH=o-$(RTEMS_HOST)
@@ -45,10 +45,6 @@ RTEMS_BSP_SPECS = $(PROJECT_ROOT)/$(RTEMS_BSP)/lib/bsp_specs
## NOTE: RTEMS libcsupport.a includes RTEMS versions of stuff like
## malloc, gettimeofday, etc.
-# Use the LIBC support for CYGNUS newlib
-# RTEMS_LIBC_DIR must already be set (by module file)
-RTEMS_USE_NEWLIB=yes
-
# Define this to yes if C++ is included in the development environment.
# This requires that at least the GNU C++ compiler and libg++ be installed.
ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
diff --git a/make/custom/gensh1.cfg b/make/custom/gensh1.cfg
index 14c877ff4e..792d7d1e26 100644
--- a/make/custom/gensh1.cfg
+++ b/make/custom/gensh1.cfg
@@ -79,5 +79,3 @@ endef
endif
# Miscellaneous additions go here
-
-SHGEN=$(PROJECT_ROOT)/c/src/exec/score/tools/sh/shgen
diff --git a/make/custom/no_bsp.cfg b/make/custom/no_bsp.cfg
index 36e757aeec..fb89f3131d 100644
--- a/make/custom/no_bsp.cfg
+++ b/make/custom/no_bsp.cfg
@@ -12,10 +12,6 @@ RTEMS_CPU_MODEL=no_cpu_model
# This is the actual bsp directory used during the build process.
RTEMS_BSP_FAMILY=no_bsp
-# Use the LIBC support for CYGNUS newlib
-# RTEMS_LIBC_DIR must already be set (by module file)
-RTEMS_USE_NEWLIB=no
-
# Define this to yes if C++ is included in the development environment.
# This requires that at least the GNU C++ compiler and libg++ be installed.
#
diff --git a/make/custom/portsw.cfg b/make/custom/portsw.cfg
index e083530894..1531eff65f 100644
--- a/make/custom/portsw.cfg
+++ b/make/custom/portsw.cfg
@@ -37,10 +37,6 @@ CONFIG.$(HOST_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc.cfg
CC_$(TARGET_ARCH)_DIR=$(RTEMS_GNUTOOLS)
CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-$(RTEMS_BSP).cfg
-# Use the LIBC support for CYGNUS newlib
-# RTEMS_LIBC_DIR must already be set (by module file)
-RTEMS_USE_NEWLIB=yes
-
# Define this to yes if C++ is included in the development environment.
# This requires that at least the GNU C++ compiler and libg++ be installed.
#
diff --git a/make/custom/posix.cfg b/make/custom/posix.cfg
index c267192b44..dd446b1c93 100644
--- a/make/custom/posix.cfg
+++ b/make/custom/posix.cfg
@@ -4,8 +4,8 @@
# $Id$
#
-include $(PROJECT_ROOT)/make/target.cfg
-include $(PROJECT_ROOT)/make/host.cfg
+include $(RTEMS_ROOT)/make/target.cfg
+include $(RTEMS_ROOT)/make/host.cfg
# Set them here, otherwise gcc-target-default.cfg will set them to values
# not working on some os variants (linux-RH5.0, glibc versions 2.0.0 - 2.0.7)
@@ -34,6 +34,3 @@ ifeq "$(origin NODE)" "environment"
NODE=0
endif
endif
-
-# BSP-specific tools
-GENSIZE=$(PROJECT_RELEASE)/bin/gensize
diff --git a/make/custom/simhppa.cfg b/make/custom/simhppa.cfg
index 6eb2ba4029..60a93d5954 100644
--- a/make/custom/simhppa.cfg
+++ b/make/custom/simhppa.cfg
@@ -137,6 +137,3 @@ endef
# BSP-specific tools
PRINTDUMP=$(PROJECT_TOOLS)/print_dump
-
-# CPU-specific tools
-GENOFFSETS=$(PROJECT_RELEASE)/bin/genoffsets
diff --git a/make/directory.cfg b/make/directory.cfg
index 1714204318..056e9fa55e 100644
--- a/make/directory.cfg
+++ b/make/directory.cfg
@@ -8,8 +8,6 @@
# See also make/main.cfg
#
-# RULE=$(shell echo $@ | $(SED) -e s/debug_// -e s/profile_//)
-
# This is a simplified variant of automake-1.4's rule for handling
# subdirectories
$(RECURSE_TARGETS):
@@ -17,8 +15,11 @@ $(RECURSE_TARGETS):
dot_seen=no; \
target=`echo $@ | sed -e s/-recursive// -e s/debug_// -e s/profile_// `; \
list='$(SUB_DIRS)'; for subdir in $$list; do \
- echo "Making $$target RTEMS_BSP=${RTEMS_BSP} in $$subdir"; \
+ echo "Making $$target in $$subdir"; \
local_target="$$target"; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done && test -z "$$fail"
+
+preinstall: preinstall-recursive
+.PHONY: preinstall preinstall-am preinstall-recursive
diff --git a/make/host.cfg.in b/make/host.cfg.in
index bcbcf4eec6..18ddc85d8b 100644
--- a/make/host.cfg.in
+++ b/make/host.cfg.in
@@ -3,8 +3,6 @@
#
# OS-specific configuration
#
-# Author: Ralf Corsepius (corsepiu@faw.uni-ulm.de) 97/11/08
-#
# Derived from rtems/c/make/os/*.cfg in previous RTEMS version.
#
@@ -17,23 +15,24 @@ RTEMS_HOST = @RTEMS_HOST@
CLEAN_OS =
CLOBBER_OS = *~ *.bak TAGS tags
-SHELL=/bin/sh
+SHELL=@SHELL@
ECHO=echo
-CAT=@CAT@
+CAT=cat
RM=@RM@ -f
CP=@CP@
MV=@MV@
LN=@LN@
MKDIR=mkdir
-CHMOD=@CHMOD@
-SED=@SED@
-M4=@M4@
+CHMOD=chmod
+SED=sed
+# Anybody using this?
+# M4=@M4@
# Global tools
-PACKHEX=$(PROJECT_TOOLS)/packhex
+PACKHEX=$(PROJECT_BIN)/packhex
-INSTALL_CHANGE=$(PROJECT_TOOLS)/install-if-change
+INSTALL_CHANGE=$(PROJECT_BIN)/install-if-change
INSTALL_VARIANT=$(INSTALL_CHANGE) -V "$(LIB_VARIANT)"
# FIXME: HACK for a bug in cygwin-hosted egcs which returns a mixture
@@ -51,7 +50,7 @@ KSH=@KSH@
#
# RCS support
#
-RCS_CLEAN=$(PROJECT_TOOLS)/rcs-clean
+RCS_CLEAN=$(PROJECT_BIN)/rcs-clean
#
# Rule to install a shell script with the proper shell to run it.
@@ -63,6 +62,7 @@ RCS_CLEAN=$(PROJECT_TOOLS)/rcs-clean
# -$(RM) $@.old
# -$(MV) $@ $@.old >/dev/null 2>&1
+# OBSOLETE: Don't use this anymore, this may be removed in future
define make-script
-$(RM) $@
$(SED) -e '1,1s?^#!KSHELL?#!$(KSH)?' \
diff --git a/make/leaf.cfg b/make/leaf.cfg
index 9a0d523e4e..0dba22970e 100644
--- a/make/leaf.cfg
+++ b/make/leaf.cfg
@@ -125,3 +125,6 @@ clobber: clean
$(RM) .#*
$(RM) -r $(CLOBBER_OS) $(CLOBBER_CC) $(CLOBBER_DEPEND)
$(RM) -r $(CLOBBER_ADDITIONS) a.out
+
+preinstall-am:
+preinstall: preinstall-am
diff --git a/make/main.cfg b/make/main.cfg
index e74ece1c2b..031a4047f2 100644
--- a/make/main.cfg
+++ b/make/main.cfg
@@ -34,12 +34,6 @@ VARIANT=
default_target: all
#
-# Describe the host os
-#
-# include $(PROJECT_ROOT)/make/target.cfg
-# include $(PROJECT_ROOT)/make/host.cfg
-
-#
# Default makefile name
# May be overridden by command line macro assignment
#
@@ -64,7 +58,8 @@ VARIANTS=${TARGET_ARCH} ${TARGET_VARIANTS:%=${TARGET_ARCH}-%}
#
RECURSE_TARGETS=all clean protos get clobber depend install \
- $(TARGET_VARIANTS) $(TARGET_VARIANTS:%=%_install)
+preinstall-recursive \
+$(TARGET_VARIANTS) $(TARGET_VARIANTS:%=%_install)
${ARCH}:
test -d ${ARCH} || mkdir ${ARCH}
diff --git a/make/target.cfg.in b/make/target.cfg.in
index 55c19287b3..f40a3753f3 100644
--- a/make/target.cfg.in
+++ b/make/target.cfg.in
@@ -11,7 +11,6 @@ CPPFLAGS = @CPPFLAGS@
DEFS = @DEFS@
LDFLAGS =
LIBS = @LIBS@
-CC_FOR_BUILD = @CC@
CC = @CC_FOR_TARGET@
AS = @AS_FOR_TARGET@
@@ -52,7 +51,6 @@ RTEMS_CPU = @RTEMS_CPU@
BARE_CPU_MODEL = @BARE_CPU_MODEL@
BARE_CPU_CFLAGS = @BARE_CPU_CFLAGS@
-# INSTALL_CHANGE=$(PROJECT_ROOT)/$(RTEMS_BSP)/build-tools/install-if-change
XCFLAGS=$(CFLAGS_FOR_TARGET)
export RTEMS_BSP