From 1896a650fc382d343844b56f4b79efe31562755e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 30 Jul 1999 17:52:50 +0000 Subject: Patch from Ralf Corsepius : 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)//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 --- c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in | 10 +++++----- c/src/lib/libbsp/i386/force386/wrapup/Makefile.in | 6 +++--- c/src/lib/libbsp/i386/i386ex/console/Makefile.in | 9 ++------- c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in | 9 ++------- c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in | 2 +- c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in | 9 ++------- c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in | 6 +++--- c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in | 6 +++--- c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in | 6 +++--- c/src/lib/libbsp/m68k/ods68302/start/Makefile.in | 15 +++++++++------ c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in | 15 +++++++++------ c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in | 5 ++--- c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in | 2 +- c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in | 2 +- .../powerpc/motorola_powerpc/bootloader/Makefile.in | 2 +- c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in | 10 +++++----- c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in | 11 ++++++++--- 17 files changed, 60 insertions(+), 65 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in index 8f7c9fff26..ade59a92a1 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in @@ -13,17 +13,17 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -BSP_PIECES = startup tty -# pieces to pick up out of libcpu/hppa -CPU_PIECES = clock milli timer -GENERIC_PIECES = - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg INSTALL = @INSTALL@ INSTALL_CHANGE = @INSTALL_CHANGE@ +BSP_PIECES = startup tty +# pieces to pick up out of libcpu/hppa +CPU_PIECES = clock milli timer +GENERIC_PIECES = + GENERIC_MP_REL_PIECES_yes_V = shmdr GENERIC_MP_REL_PIECES_no_V = GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V) diff --git a/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in b/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in index 556ab0be25..ee6419acb2 100644 --- a/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i386/force386/wrapup/Makefile.in @@ -13,15 +13,15 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -BSP_PIECES = startup clock console timer -GENERIC_PIECES = - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg INSTALL = @INSTALL@ INSTALL_CHANGE = @INSTALL_CHANGE@ +BSP_PIECES = startup clock console timer +GENERIC_PIECES = + GENERIC_MP_REL_PIECES_yes_V = shmdr GENERIC_MP_REL_PIECES_no_V = GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V) diff --git a/c/src/lib/libbsp/i386/i386ex/console/Makefile.in b/c/src/lib/libbsp/i386/i386ex/console/Makefile.in index 89a960a0a8..362a11196c 100644 --- a/c/src/lib/libbsp/i386/i386ex/console/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/console/Makefile.in @@ -11,12 +11,10 @@ subdir = libbsp/i386/i386ex/console RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ -VPATH = @srcdir@ +VPATH = @srcdir@:@srcdir@/../../shared/io PGM = ${ARCH}/console.rel -IMPORT_SRC = $(srcdir)/../../shared/io/printk.c - # C source names, if any, go here -- minus the .c C_PIECES = console printk C_FILES = $(C_PIECES:%=%.c) @@ -58,13 +56,10 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -preinstall: - ${CP} ${IMPORT_SRC} . - ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} preinstall $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile install: all diff --git a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in index 9c4bbcd3a3..a52b4b4fd8 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in @@ -11,12 +11,10 @@ subdir = libbsp/i386/ts_386ex/console RTEMS_ROOT = @RTEMS_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@ -VPATH = @srcdir@ +VPATH = @srcdir@:@srcdir@/../../shared/io PGM = ${ARCH}/console.rel -IMPORT_SRC = $(srcdir)/../../shared/io/printk.c - # C source names, if any, go here -- minus the .c C_PIECES = console printk C_FILES = $(C_PIECES:%=%.c) @@ -58,13 +56,10 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -preinstall: - ${CP} ${IMPORT_SRC} . - ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} preinstall $(SRCS) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile install: all diff --git a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in index 351d3111e3..a3eb8f1b1e 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in @@ -58,7 +58,7 @@ CLEAN_ADDITIONS += CLOBBER_ADDITIONS += all: ${ARCH} $(SRCS) $(OBJS) $(PGM) - $(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib + @$(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) diff --git a/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in index a9239c3af9..49dc43404a 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in +++ b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in @@ -69,15 +69,10 @@ LDFLAGS += CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -preinstall: - $(INSTALL_CHANGE) ${IMPORT_SRC} . - -# ${CP} ${IMPORT_SRC} . - ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} preinstall $(SRCS) $(PGM) - $(INSTALL_CHANGE) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib +all: ${ARCH} $(SRCS) $(PGM) + @$(INSTALL_CHANGE) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile install: all diff --git a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in index c69dc7578d..06f04bee2a 100644 --- a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in @@ -13,15 +13,15 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -BSP_PIECES = startup clock console timer -GENERIC_PIECES = - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg INSTALL = @INSTALL@ INSTALL_CHANGE = @INSTALL_CHANGE@ +BSP_PIECES = startup clock console timer +GENERIC_PIECES = + GENERIC_MP_REL_PIECES_yes_V = shmdr GENERIC_MP_REL_PIECES_no_V = GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V) diff --git a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in index 0714664f84..855fda6f0a 100644 --- a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in @@ -13,15 +13,15 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -BSP_PIECES = startup clock console timer -GENERIC_PIECES = - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg INSTALL = @INSTALL@ INSTALL_CHANGE = @INSTALL_CHANGE@ +BSP_PIECES = startup clock console timer +GENERIC_PIECES = + GENERIC_MP_REL_PIECES_yes_V = shmdr GENERIC_MP_REL_PIECES_no_V = GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V) diff --git a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in index 96db499a02..8d14da3eb0 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in @@ -13,15 +13,15 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -BSP_PIECES = startup clock console timer -GENERIC_PIECES = - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg INSTALL = @INSTALL@ INSTALL_CHANGE = @INSTALL_CHANGE@ +BSP_PIECES = startup clock console timer +GENERIC_PIECES = + GENERIC_MP_REL_PIECES_yes_V = shmdr GENERIC_MP_REL_PIECES_no_V = GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V) 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 += diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in index 079e905f71..2427ea6aed 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in @@ -13,14 +13,13 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -BSP_PIECES = startup clock console timer -GENERIC_PIECES = $ - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ +BSP_PIECES = startup clock console timer + GENERIC_MP_REL_PIECES_yes_V = shmdr GENERIC_MP_REL_PIECES_no_V = GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V) diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in index 69087a68f0..cd2ca90b77 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in @@ -67,7 +67,7 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(INSTALLED_O_FILES) $(PGM) +all: ${ARCH} $(SRCS) $(PGM) $(INSTALL_CHANGE) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status diff --git a/c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in index a470add0e4..5e65472f0f 100644 --- a/c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in +++ b/c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in @@ -53,7 +53,7 @@ LD_PATHS += LD_LIBS += LDFLAGS += -IMAGES : = rtems.gz +IMAGES = rtems.gz # # Add your list of files to delete here. The config files diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in index a470add0e4..5e65472f0f 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in @@ -53,7 +53,7 @@ LD_PATHS += LD_LIBS += LDFLAGS += -IMAGES : = rtems.gz +IMAGES = rtems.gz # # Add your list of files to delete here. The config files diff --git a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in index b81b1ca057..0b1aa0480c 100644 --- a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in @@ -13,17 +13,17 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -BSP_PIECES = startup clock console timer vectors -# pieces to pick up out of libcpu/ppc -CPU_PIECES = -GENERIC_PIECES = - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/lib.cfg INSTALL = @INSTALL@ INSTALL_CHANGE = @INSTALL_CHANGE@ +BSP_PIECES = startup clock console timer vectors +# pieces to pick up out of libcpu/ppc +CPU_PIECES = +GENERIC_PIECES = + GENERIC_MP_REL_PIECES_yes_V = shmdr GENERIC_MP_REL_PIECES_no_V = GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V) diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in index 6953c1ac9c..cfea59e73d 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in @@ -35,6 +35,12 @@ 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_RELEASE)/lib + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) # First and second generation use different Bridge chips :( # C source names, if any, go here -- minus the .c @@ -69,9 +75,8 @@ CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) -all: ${ARCH} $(SRCS) $(INSTALLED_O_FILES) $(PGM) - $(INSTALL) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib - $(INSTALL_VARIANT) $(INSTALLED_O_FILES) $(PROJECT_RELEASE)/lib +all: ${ARCH} $(SRCS) $(PGM) + $(INSTALL_CHANGE) -m 644 $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ -- cgit v1.2.3