summaryrefslogtreecommitdiffstats
path: root/make/Templates
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-08-06 17:55:25 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-08-06 17:55:25 +0000
commit3a8915e6ee7974d832994d218c6a90b83cd86323 (patch)
tree3dde98ccb6120fb27412044b6b951c2af13a2781 /make/Templates
parent22544db9d8349d709505cf75616746e5635dc6f4 (diff)
downloadrtems-3a8915e6ee7974d832994d218c6a90b83cd86323.tar.bz2
Patch rtems-rc-19990709-6-diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
applied. This modified many Makefiles and custom files and makes many more settings (network, multiprocessing, etc) gnerated by autoconf.
Diffstat (limited to 'make/Templates')
-rw-r--r--make/Templates/Makefile.am2
-rw-r--r--make/Templates/Makefile.in4
-rw-r--r--make/Templates/Makefile.inc.in48
3 files changed, 1 insertions, 53 deletions
diff --git a/make/Templates/Makefile.am b/make/Templates/Makefile.am
index 947edad3a1..fe35e32c92 100644
--- a/make/Templates/Makefile.am
+++ b/make/Templates/Makefile.am
@@ -6,9 +6,7 @@ AUTOMAKE_OPTIONS = foreign 1.4
EXTRA_DIST = \
Makefile.dir \
-Makefile.inc.in \
Makefile.leaf \
Makefile.lib
-# -------------------------------------------------------
include $(top_srcdir)/automake/local.am
diff --git a/make/Templates/Makefile.in b/make/Templates/Makefile.in
index 2bafd8f7f2..b179f335f8 100644
--- a/make/Templates/Makefile.in
+++ b/make/Templates/Makefile.in
@@ -87,7 +87,7 @@ target_subdirs = @target_subdirs@
AUTOMAKE_OPTIONS = foreign 1.4
-EXTRA_DIST = Makefile.dir Makefile.inc.in Makefile.leaf Makefile.lib
+EXTRA_DIST = Makefile.dir Makefile.leaf Makefile.lib
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
@@ -208,8 +208,6 @@ 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/Templates/Makefile.inc.in b/make/Templates/Makefile.inc.in
deleted file mode 100644
index a763dae999..0000000000
--- a/make/Templates/Makefile.inc.in
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#
-# Target specific settings. To be included in application Makefiles.
-#
-
-prefix = @prefix@
-
-CC_FOR_TARGET = @program_prefix@gcc
-AS_FOR_TARGET = @program_prefix@as
-AR_FOR_TARGET = @program_prefix@ar
-NM_FOR_TARGET = @program_prefix@nm
-LD_FOR_TARGET = @program_prefix@ld
-SIZE_FOR_TARGET = @program_prefix@size
-OBJCOPY_FOR_TARGET = @program_prefix@objcopy
-
-CC= $(CC_FOR_TARGET)
-AS= $(AS_FOR_TARGET)
-LD= $(LD_FOR_TARGET)
-NM= $(NM_FOR_TARGET)
-AR= $(AR_FOR_TARGET)
-SIZE= $(SIZE_FOR_TARGET)
-OBJCOPY= $(OBJCOPY_FOR_TARGET)
-
-export CC
-export AS
-export LD
-export NM
-export AR
-export SIZE
-export OBJCOPY
-
-RTEMS_HOST = @RTEMS_HOST@
-RTEMS_CUSTOM = $(prefix)/make/custom/$(RTEMS_BSP).cfg
-PROJECT_ROOT = $(prefix)/
-RTEMS_USE_OWN_PDIR = no
-RTEMS_HAS_POSIX_API = @RTEMS_HAS_POSIX_API@
-RTEMS_USE_MACROS = @RTEMS_USE_MACROS@
-RTEMS_HAS_CPLUSPLUS = @RTEMS_HAS_CPLUSPLUS@
-RTEMS_USE_GCC272 = @RTEMS_USE_GCC272@
-RTEMS_LIBC_DIR = @RTEMS_LIBC_DIR@
-
-export RTEMS_BSP
-export RTEMS_CUSTOM
-export PROJECT_ROOT
-
-# FIXME: The following shouldn't be here
-RTEMS_ROOT = $(PROJECT_ROOT)
-export RTEMS_ROOT