From 38840f7beb1c12ce8e0805e31de39950a7c41612 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 18 Feb 1999 18:03:38 +0000 Subject: Part of the automake VI patch from Ralf Corsepius : > 3) rtems-rc-19990131-2.diff > > This patch removes generating bsp_specs from leaf.cfg and generates > bsp_specs from inside of c/Makefile instead. > > The motivation behind this patch is to avoid "polluting" Makefiles by > unneccessary rules from included Makefile-fragments (*.cfg-files) and > try to handle files by explicit rules in Makefiles instead (FYI: > automake-1.4 physically includes Makefile fragments at the time > automake is run, not at the time make is run as RTEMS Makefile.ins do > now) > > Nevertheless, this patch is rather uncritical, almost cosmetical - If > you don't like it, then dump it ;-, however I doubt that subsequent > patches will apply then ;-. --- c/Makefile.in | 15 ++++++++++++++- c/src/exec/score/cpu/a29k/Makefile.in | 7 +------ c/src/exec/score/cpu/hppa1.1/Makefile.in | 7 +------ c/src/exec/score/cpu/i386/Makefile.in | 7 +------ c/src/exec/score/cpu/i960/Makefile.in | 7 +------ c/src/exec/score/cpu/m68k/Makefile.in | 7 +------ c/src/exec/score/cpu/mips64orion/Makefile.in | 7 +------ c/src/exec/score/cpu/no_cpu/Makefile.in | 8 -------- c/src/exec/score/cpu/powerpc/Makefile.in | 7 +------ c/src/exec/score/cpu/sh/Makefile.in | 8 +------- c/src/exec/score/cpu/sparc/Makefile.in | 7 +------ c/src/exec/score/cpu/unix/Makefile.in | 11 +---------- make/leaf.cfg | 8 -------- 13 files changed, 24 insertions(+), 82 deletions(-) diff --git a/c/Makefile.in b/c/Makefile.in index 0e13451cce..86224be989 100644 --- a/c/Makefile.in +++ b/c/Makefile.in @@ -64,6 +64,18 @@ CREATE_DIRS = \ BUILD_DIRS = ${CREATE_DIRS:%=$(PROJECT_ROOT)/$(RTEMS_BSP)/%} +# bsp_specs should be installed by a bsp-specific configure script +BSP_SPECS = $(PROJECT_RELEASE)/lib/bsp_specs +ifeq ($(RTEMS_BSP),bare) +BSP_SPECS_DIR = $(RTEMS_ROOT)/c/src/lib/libbsp/$(RTEMS_BSP_FAMILY) +else +BSP_SPECS_DIR = $(RTEMS_ROOT)/c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY) +endif + +$(BSP_SPECS): $(BSP_SPECS_DIR)/bsp_specs + cp $< $@ + chmod 444 $@ + # Make all/install must include 'env' # if something is added to TARGET_VARIANTS, then account for it here make_src_makefiles: Makefile.in Makefile @@ -145,4 +157,5 @@ debug_tests: debug profile_tests: profile cd src/tests; $(MAKE) profile -env: $(SRCS) dirs +env: $(SRCS) dirs $(BSP_SPECS) + diff --git a/c/src/exec/score/cpu/a29k/Makefile.in b/c/src/exec/score/cpu/a29k/Makefile.in index ddffc4e4e6..972d657cf2 100644 --- a/c/src/exec/score/cpu/a29k/Makefile.in +++ b/c/src/exec/score/cpu/a29k/Makefile.in @@ -65,13 +65,8 @@ $(ARCH)/rtems-cpu.rel: $(OBJS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL) -preinstall: $(ARCH) \ - ${PROJECT_RELEASE}/lib/bsp_specs +preinstall: $(ARCH) $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score # we will share the basic cpu file $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE) -${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp - $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@ - -# $(ARCH)/bsp_specs.tmp rule is in leaf.cfg diff --git a/c/src/exec/score/cpu/hppa1.1/Makefile.in b/c/src/exec/score/cpu/hppa1.1/Makefile.in index a7b7b02be6..81d8371320 100644 --- a/c/src/exec/score/cpu/hppa1.1/Makefile.in +++ b/c/src/exec/score/cpu/hppa1.1/Makefile.in @@ -67,13 +67,8 @@ all: ${ARCH} install-headers preinstall $(RELS) preinstall: $(ARCH) $(SRCS) $(ARCH)/offsets.h $(INSTALL) -m 444 $(ARCH)/offsets.h $(PROJECT_INCLUDE)/rtems/score -install-headers: $(ARCH) \ - ${PROJECT_RELEASE}/lib/bsp_specs +install-headers: $(ARCH) $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score # we will share the basic cpu file $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE) -${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp - $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@ - -# $(ARCH)/bsp_specs.tmp rule is in leaf.cfg diff --git a/c/src/exec/score/cpu/i386/Makefile.in b/c/src/exec/score/cpu/i386/Makefile.in index 6102a53fdf..3fe611fb4f 100644 --- a/c/src/exec/score/cpu/i386/Makefile.in +++ b/c/src/exec/score/cpu/i386/Makefile.in @@ -63,13 +63,8 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) # for include files, just use $(INSTALL) install: all -preinstall: $(ARCH) \ - ${PROJECT_RELEASE}/lib/bsp_specs +preinstall: $(ARCH) $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score # we will share the basic cpu file $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE) -${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp - $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@ - -# $(ARCH)/bsp_specs.tmp rule is in leaf.cfg diff --git a/c/src/exec/score/cpu/i960/Makefile.in b/c/src/exec/score/cpu/i960/Makefile.in index 6cc351d017..6de3b0cf4c 100644 --- a/c/src/exec/score/cpu/i960/Makefile.in +++ b/c/src/exec/score/cpu/i960/Makefile.in @@ -62,13 +62,8 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) # for include files, just use $(INSTALL) install: all -preinstall: $(ARCH) \ - ${PROJECT_RELEASE}/lib/bsp_specs +preinstall: $(ARCH) $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score # we will share the basic cpu file $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE) -${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp - $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@ - -# $(ARCH)/bsp_specs.tmp rule is in leaf.cfg diff --git a/c/src/exec/score/cpu/m68k/Makefile.in b/c/src/exec/score/cpu/m68k/Makefile.in index acf4b6b44f..2a0e7fb254 100644 --- a/c/src/exec/score/cpu/m68k/Makefile.in +++ b/c/src/exec/score/cpu/m68k/Makefile.in @@ -59,13 +59,8 @@ $(ARCH)/rtems-cpu.rel: $(OBJS) all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) -preinstall: $(ARCH) \ - ${PROJECT_RELEASE}/lib/bsp_specs +preinstall: $(ARCH) $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score # we will share the basic cpu file $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE) -${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp - $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@ - -# $(ARCH)/bsp_specs.tmp rule is in leaf.cfg diff --git a/c/src/exec/score/cpu/mips64orion/Makefile.in b/c/src/exec/score/cpu/mips64orion/Makefile.in index bcf1481f9c..16d0ba4f82 100644 --- a/c/src/exec/score/cpu/mips64orion/Makefile.in +++ b/c/src/exec/score/cpu/mips64orion/Makefile.in @@ -65,13 +65,8 @@ $(ARCH)/rtems-cpu.rel: $(OBJS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL) -preinstall: $(ARCH) \ - ${PROJECT_RELEASE}/lib/bsp_specs +preinstall: $(ARCH) $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score # we will share the basic cpu file $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE) -${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp - $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@ - -# $(ARCH)/bsp_specs.tmp rule is in leaf.cfg diff --git a/c/src/exec/score/cpu/no_cpu/Makefile.in b/c/src/exec/score/cpu/no_cpu/Makefile.in index 0110dbf595..74b0411475 100644 --- a/c/src/exec/score/cpu/no_cpu/Makefile.in +++ b/c/src/exec/score/cpu/no_cpu/Makefile.in @@ -64,15 +64,7 @@ $(ARCH)/rtems-cpu.rel: $(OBJS) # for include files, just use $(INSTALL) install: all -# Real ports using the gnu tools will need to have bsp_specs!!! -# ${PROJECT_RELEASE}/lib/bsp_specs preinstall: $(ARCH) $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score # we will share the basic cpu file $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE) - -# Real ports using the gnu tools will need to have bsp_specs!!! -#${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp -# $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@ - -# $(ARCH)/bsp_specs.tmp rule is in leaf.cfg diff --git a/c/src/exec/score/cpu/powerpc/Makefile.in b/c/src/exec/score/cpu/powerpc/Makefile.in index 8a75dafc4e..c4f04ccc9a 100644 --- a/c/src/exec/score/cpu/powerpc/Makefile.in +++ b/c/src/exec/score/cpu/powerpc/Makefile.in @@ -66,15 +66,10 @@ $(ARCH)/cpu_asm.o: irq_stub.s # for include files, just use $(INSTALL) install: all -preinstall: $(ARCH) \ - ${PROJECT_RELEASE}/lib/bsp_specs +preinstall: $(ARCH) $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score # we will share the basic cpu file $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE) # make a link in case we are not compiling in the source directory #test -f irq_stub.s || $(LN) -s $(srcdir)/irq_stub.s irq_stub.s -${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp - $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@ - -# $(ARCH)/bsp_specs.tmp rule is in leaf.cfg diff --git a/c/src/exec/score/cpu/sh/Makefile.in b/c/src/exec/score/cpu/sh/Makefile.in index aeae1bfffb..6a442526d4 100644 --- a/c/src/exec/score/cpu/sh/Makefile.in +++ b/c/src/exec/score/cpu/sh/Makefile.in @@ -70,13 +70,7 @@ $(ARCH)/rtems-cpu.rel: $(OBJS) # for include files, just use $(INSTALL) install: all -preinstall: $(ARCH) \ - ${PROJECT_RELEASE}/lib/bsp_specs +preinstall: $(ARCH) $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score # we will share the basic cpu file $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE) - -${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp - $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@ - -# $(ARCH)/bsp_specs.tmp rule is in leaf.cfg diff --git a/c/src/exec/score/cpu/sparc/Makefile.in b/c/src/exec/score/cpu/sparc/Makefile.in index ce82aea680..6189c54d07 100644 --- a/c/src/exec/score/cpu/sparc/Makefile.in +++ b/c/src/exec/score/cpu/sparc/Makefile.in @@ -58,13 +58,8 @@ $(ARCH)/rtems-cpu.rel: $(OBJS) all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) -preinstall: $(ARCH) \ - ${PROJECT_RELEASE}/lib/bsp_specs +preinstall: $(ARCH) $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score # we will share the basic cpu file $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE) -${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp - $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@ - -# $(ARCH)/bsp_specs.tmp rule is in leaf.cfg diff --git a/c/src/exec/score/cpu/unix/Makefile.in b/c/src/exec/score/cpu/unix/Makefile.in index 1a88a6b1de..8caf79eef2 100644 --- a/c/src/exec/score/cpu/unix/Makefile.in +++ b/c/src/exec/score/cpu/unix/Makefile.in @@ -64,15 +64,6 @@ all: ${ARCH} $(SRCS) $(ARCH)/unixsize.h preinstall $(RELS) # for include files, just use $(INSTALL) install: all -# Real ports using the gnu tools will need to have bsp_specs!!! -# ${PROJECT_RELEASE}/lib/bsp_specs -preinstall: $(ARCH) $(ARCH)/unixsize.h \ - $(PROJECT_RELEASE)/lib/bsp_specs +preinstall: $(ARCH) $(ARCH)/unixsize.h $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score $(INSTALL) -m 444 ${ARCH}/unixsize.h $(PROJECT_INCLUDE)/rtems/score - -# Real ports using the gnu tools will need to have bsp_specs!!! -${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp - $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@ -# -# $(ARCH)/bsp_specs.tmp rule is in leaf.cfg diff --git a/make/leaf.cfg b/make/leaf.cfg index ce562ee755..9a0d523e4e 100644 --- a/make/leaf.cfg +++ b/make/leaf.cfg @@ -125,11 +125,3 @@ clobber: clean $(RM) .#* $(RM) -r $(CLOBBER_OS) $(CLOBBER_CC) $(CLOBBER_DEPEND) $(RM) -r $(CLOBBER_ADDITIONS) a.out - -ifeq ($(RTEMS_BSP),bare) -$(ARCH)/bsp_specs.tmp: FORCE - cp $(RTEMS_ROOT)/c/src/lib/libbsp/$(RTEMS_BSP_FAMILY)/bsp_specs $@ -else -$(ARCH)/bsp_specs.tmp: FORCE - cp $(RTEMS_ROOT)/c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/bsp_specs $@ -endif -- cgit v1.2.3