diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-07-30 17:52:50 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-07-30 17:52:50 +0000 |
| commit | 1896a650fc382d343844b56f4b79efe31562755e (patch) | |
| tree | 922de4dd1237cfcf6c7be0a8050e1e964fceadad /c/src/lib/libbsp/m68k/ods68302 | |
| parent | Fixed typos. (diff) | |
| download | rtems-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/lib/libbsp/m68k/ods68302')
| -rw-r--r-- | c/src/lib/libbsp/m68k/ods68302/start/Makefile.in | 15 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in | 15 |
2 files changed, 18 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in index 320a8cb8ff..c0539f0ad8 100644 --- a/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in +++ b/c/src/lib/libbsp/m68k/ods68302/start/Makefile.in @@ -15,11 +15,14 @@ VPATH = @srcdir@ PGM = ${ARCH}/start302.o -ifeq ($(RTEMS_DEBUGGER),yes) -RESET_S_PIECES = debugreset reset -else -CFLAGS += -endif +RESET_S_PIECES_yes_V = debugreset +RESET_S_PIECES_no_V = reset +RESET_S_PIECES__V = $(RESET_S_PIECES_no_V) +RESET_S_PIECES = $(RESET_S_PIECES_$(RTEMS_DEBUGGER)_V) + +CFLAGS_no_V = -DGDB_MONITOR_ACTIVE +CFLAGS__V = $(CFLAGS_no_V) +CFLAGS_V = $(CFLAGS_$(RTEMS_DEBUGGER)_V) # C source names, if any, go here -- minus the .c C_PIECES = cpuboot @@ -47,7 +50,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@ DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += $(CFLAGS_V) LD_PATHS += LD_LIBS += diff --git a/c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in index 320a8cb8ff..c0539f0ad8 100644 --- a/c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in +++ b/c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in @@ -15,11 +15,14 @@ VPATH = @srcdir@ PGM = ${ARCH}/start302.o -ifeq ($(RTEMS_DEBUGGER),yes) -RESET_S_PIECES = debugreset reset -else -CFLAGS += -endif +RESET_S_PIECES_yes_V = debugreset +RESET_S_PIECES_no_V = reset +RESET_S_PIECES__V = $(RESET_S_PIECES_no_V) +RESET_S_PIECES = $(RESET_S_PIECES_$(RTEMS_DEBUGGER)_V) + +CFLAGS_no_V = -DGDB_MONITOR_ACTIVE +CFLAGS__V = $(CFLAGS_no_V) +CFLAGS_V = $(CFLAGS_$(RTEMS_DEBUGGER)_V) # C source names, if any, go here -- minus the .c C_PIECES = cpuboot @@ -47,7 +50,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@ DEFINES += CPPFLAGS += -CFLAGS += +CFLAGS += $(CFLAGS_V) LD_PATHS += LD_LIBS += |