summaryrefslogtreecommitdiffstats
path: root/c/src/exec/score
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-07-30 17:52:50 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-07-30 17:52:50 +0000
commit1896a650fc382d343844b56f4b79efe31562755e (patch)
tree922de4dd1237cfcf6c7be0a8050e1e964fceadad /c/src/exec/score
parentFixed typos. (diff)
downloadrtems-1896a650fc382d343844b56f4b79efe31562755e.tar.bz2
Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
The main topic is replacing the hard-coded values for HAS_MP and HAS_RDBG in custom/*.cfg with per-bsp configuration-time autoconf checks (This is the patch I had mentioned before earlier this week). CHANGES * HAS_MP removed from custom/*.cfg, replaced with configuration time autoconf check * HAS_RDBG removed from custom/*.cfg, replaced with configuration-time autoconf check * NEW: c/src/make/bsp.cfg.in, takes configuration-time checked per-bsp values (i.e. HAS_MP, HAS_RDBG), gets installed as $(prefix)/<bsp>/make/bsp.cfg * NEW: default.cfg includes bsp.cfg - this change is backward compatible. * IMPORT_SRC: apply VPATH instead for ts_386ex/i386ex subdirectory Makefile.ins * HACK: a bug in acpolish mis-handles addtions to makefile variables which are enclosed in gmake conditionals: c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in * Apply inline_dir, HAS_MP and HAS_RDBG for avoiding configuration of unneeded subdirectories in various configure.in files. * Several minor changes in Makefile.ins and configure.ins, wrt. to the order of including *.cfg and defining Makefile variables APPLYING THE PATCH: patch -p1 < rtems-rc-19990709-4.diff ./autogen
Diffstat (limited to 'c/src/exec/score')
-rw-r--r--c/src/exec/score/Makefile.in2
-rw-r--r--c/src/exec/score/include/rtems/score/Makefile.in22
-rw-r--r--c/src/exec/score/inline/rtems/score/Makefile.in22
-rw-r--r--c/src/exec/score/macros/rtems/score/Makefile.in22
-rw-r--r--c/src/exec/score/src/Makefile.in10
5 files changed, 39 insertions, 39 deletions
diff --git a/c/src/exec/score/Makefile.in b/c/src/exec/score/Makefile.in
index 390a141437..9c43167f35 100644
--- a/c/src/exec/score/Makefile.in
+++ b/c/src/exec/score/Makefile.in
@@ -27,7 +27,7 @@ $(INSTALLDIRS):
SUB_DIRS = include $(INLINE) cpu src
preinstall:
- $(mkinstalldirs) $(INSTALLDIRS)
+ @$(mkinstalldirs) $(INSTALLDIRS)
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
diff --git a/c/src/exec/score/include/rtems/score/Makefile.in b/c/src/exec/score/include/rtems/score/Makefile.in
index c8c24d01da..d0c6b21300 100644
--- a/c/src/exec/score/include/rtems/score/Makefile.in
+++ b/c/src/exec/score/include/rtems/score/Makefile.in
@@ -13,6 +13,17 @@ PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
+
+$(INSTALLDIRS):
+ @$(mkinstalldirs) $(INSTALLDIRS)
+
# We only build multiprocessing related files if HAS_MP was defined
MP_H_PIECES_yes_V = mpci mppkt objectmp threadmp
MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V)
@@ -26,17 +37,6 @@ TARGOPTS = targopts.h
SRCS = $(H_FILES) $(TARGOPTS)
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
RTEMS_USE_NEWLIB = @RTEMS_USE_NEWLIB@
#
diff --git a/c/src/exec/score/inline/rtems/score/Makefile.in b/c/src/exec/score/inline/rtems/score/Makefile.in
index 20dd5ad966..1321b144a2 100644
--- a/c/src/exec/score/inline/rtems/score/Makefile.in
+++ b/c/src/exec/score/inline/rtems/score/Makefile.in
@@ -13,17 +13,6 @@ PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
-# We only build multiprocessing related files if HAS_MP was defined
-MP_I_PIECES_yes_V = mppkt objectmp threadmp
-MP_I_PIECES = $(MP_I_PIECES_$(HAS_MP)_V)
-
-I_PIECES = address chain coremsg coremutex coresem heap isr object priority \
- stack states sysstate thread tod tqdata userext watchdog wkspace \
- $(MP_I_PIECES)
-I_FILES = $(I_PIECES:%=$(srcdir)/%.inl)
-
-SRCS = $(I_FILES)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/lib.cfg
@@ -35,6 +24,17 @@ INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
$(INSTALLDIRS):
@$(mkinstalldirs) $(INSTALLDIRS)
+# We only build multiprocessing related files if HAS_MP was defined
+MP_I_PIECES_yes_V = mppkt objectmp threadmp
+MP_I_PIECES = $(MP_I_PIECES_$(HAS_MP)_V)
+
+I_PIECES = address chain coremsg coremutex coresem heap isr object priority \
+ stack states sysstate thread tod tqdata userext watchdog wkspace \
+ $(MP_I_PIECES)
+I_FILES = $(I_PIECES:%=$(srcdir)/%.inl)
+
+SRCS = $(I_FILES)
+
#
# Add your list of files to delete here. The config files
# already know how to delete some stuff, so you may want
diff --git a/c/src/exec/score/macros/rtems/score/Makefile.in b/c/src/exec/score/macros/rtems/score/Makefile.in
index 933374d854..aa85874d34 100644
--- a/c/src/exec/score/macros/rtems/score/Makefile.in
+++ b/c/src/exec/score/macros/rtems/score/Makefile.in
@@ -13,17 +13,6 @@ PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
-# We only build multiprocessing related files if HAS_MP was defined
-MP_I_PIECES_yes_V = mppkt objectmp threadmp
-MP_I_PIECES = $(MP_I_PIECES_$(HAS_MP)_V)
-
-I_PIECES = address chain coremsg coremutex coresem heap isr object priority \
- stack states sysstate thread tod tqdata userext watchdog wkspace \
- $(MP_I_PIECES)
-I_FILES = $(I_PIECES:%=$(srcdir)/%.inl)
-
-SRCS = $(I_FILES)
-
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/lib.cfg
@@ -35,6 +24,17 @@ INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
$(INSTALLDIRS):
@$(mkinstalldirs) $(INSTALLDIRS)
+# We only build multiprocessing related files if HAS_MP was defined
+MP_I_PIECES_yes_V = mppkt objectmp threadmp
+MP_I_PIECES = $(MP_I_PIECES_$(HAS_MP)_V)
+
+I_PIECES = address chain coremsg coremutex coresem heap isr object priority \
+ stack states sysstate thread tod tqdata userext watchdog wkspace \
+ $(MP_I_PIECES)
+I_FILES = $(I_PIECES:%=$(srcdir)/%.inl)
+
+SRCS = $(I_FILES)
+
#
# Add your list of files to delete here. The config files
# already know how to delete some stuff, so you may want
diff --git a/c/src/exec/score/src/Makefile.in b/c/src/exec/score/src/Makefile.in
index b4967b432d..f4cbf9d352 100644
--- a/c/src/exec/score/src/Makefile.in
+++ b/c/src/exec/score/src/Makefile.in
@@ -13,6 +13,11 @@ PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+INSTALL_CHANGE = @INSTALL_CHANGE@
+
# We only build multiprocessing related files if HAS_MP was defined
MP_C_PIECES_yes_V = mpci objectmp threadmp
MP_C_PIECES = $(MP_C_PIECES_$(HAS_MP)_V)
@@ -35,11 +40,6 @@ C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
SRCS = $(C_FILES)
OBJS = $(C_O_FILES)
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
#
# Add local stuff here using +=
#