Changeset 38840f7b in rtems


Ignore:
Timestamp:
Feb 18, 1999, 6:03:38 PM (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
25d457b8
Parents:
4cc89bd
Message:

Part of the automake VI patch from Ralf Corsepius <corsepiu@…>:

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 ;-.

Files:
13 edited

Legend:

Unmodified
Added
Removed
  • c/Makefile.in

    r4cc89bd r38840f7b  
    6464
    6565BUILD_DIRS = ${CREATE_DIRS:%=$(PROJECT_ROOT)/$(RTEMS_BSP)/%}
     66
     67# bsp_specs should be installed by a bsp-specific configure script
     68BSP_SPECS = $(PROJECT_RELEASE)/lib/bsp_specs
     69ifeq ($(RTEMS_BSP),bare)
     70BSP_SPECS_DIR = $(RTEMS_ROOT)/c/src/lib/libbsp/$(RTEMS_BSP_FAMILY)
     71else       
     72BSP_SPECS_DIR = $(RTEMS_ROOT)/c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)
     73endif
     74
     75$(BSP_SPECS): $(BSP_SPECS_DIR)/bsp_specs
     76        cp $< $@
     77        chmod 444 $@
    6678
    6779# Make all/install must include 'env'
     
    146158        cd src/tests; $(MAKE) profile
    147159
    148 env:    $(SRCS) dirs
     160env:    $(SRCS) dirs $(BSP_SPECS)
     161
  • c/src/exec/score/cpu/a29k/Makefile.in

    r4cc89bd r38840f7b  
    6666# for include files, just use $(INSTALL)
    6767
    68 preinstall: $(ARCH) \
    69             ${PROJECT_RELEASE}/lib/bsp_specs
     68preinstall: $(ARCH)
    7069        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
    7170# we will share the basic cpu file
    7271        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    7372
    74 ${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    75         $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
    76 
    77 # $(ARCH)/bsp_specs.tmp rule is in leaf.cfg
  • c/src/exec/score/cpu/hppa1.1/Makefile.in

    r4cc89bd r38840f7b  
    6868        $(INSTALL) -m 444 $(ARCH)/offsets.h $(PROJECT_INCLUDE)/rtems/score
    6969
    70 install-headers: $(ARCH) \
    71             ${PROJECT_RELEASE}/lib/bsp_specs
     70install-headers: $(ARCH)
    7271        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
    7372# we will share the basic cpu file
    7473        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    7574
    76 ${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    77         $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
    78 
    79 # $(ARCH)/bsp_specs.tmp rule is in leaf.cfg
  • c/src/exec/score/cpu/i386/Makefile.in

    r4cc89bd r38840f7b  
    6464install:  all
    6565
    66 preinstall: $(ARCH) \
    67             ${PROJECT_RELEASE}/lib/bsp_specs
     66preinstall: $(ARCH)
    6867        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
    6968# we will share the basic cpu file
    7069        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    7170
    72 ${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    73         $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
    74 
    75 # $(ARCH)/bsp_specs.tmp rule is in leaf.cfg
  • c/src/exec/score/cpu/i960/Makefile.in

    r4cc89bd r38840f7b  
    6363install:  all
    6464
    65 preinstall: $(ARCH) \
    66             ${PROJECT_RELEASE}/lib/bsp_specs
     65preinstall: $(ARCH)
    6766        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
    6867# we will share the basic cpu file
    6968        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    7069
    71 ${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    72         $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
    73 
    74 # $(ARCH)/bsp_specs.tmp rule is in leaf.cfg
  • c/src/exec/score/cpu/m68k/Makefile.in

    r4cc89bd r38840f7b  
    6060all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
    6161
    62 preinstall: $(ARCH) \
    63             ${PROJECT_RELEASE}/lib/bsp_specs
     62preinstall: $(ARCH)
    6463        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
    6564# we will share the basic cpu file
    6665        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    6766
    68 ${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    69         $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
    70 
    71 # $(ARCH)/bsp_specs.tmp rule is in leaf.cfg
  • c/src/exec/score/cpu/mips64orion/Makefile.in

    r4cc89bd r38840f7b  
    6666# for include files, just use $(INSTALL)
    6767
    68 preinstall: $(ARCH) \
    69             ${PROJECT_RELEASE}/lib/bsp_specs
     68preinstall: $(ARCH)
    7069        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
    7170# we will share the basic cpu file
    7271        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    7372
    74 ${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    75         $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
    76 
    77 # $(ARCH)/bsp_specs.tmp rule is in leaf.cfg
  • c/src/exec/score/cpu/no_cpu/Makefile.in

    r4cc89bd r38840f7b  
    6565install:  all
    6666
    67 # Real ports using the gnu tools will need to have bsp_specs!!!
    68 #            ${PROJECT_RELEASE}/lib/bsp_specs
    6967preinstall: $(ARCH)
    7068        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
    7169# we will share the basic cpu file
    7270        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    73 
    74 # Real ports using the gnu tools will need to have bsp_specs!!!
    75 #${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    76 #       $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
    77 
    78 # $(ARCH)/bsp_specs.tmp rule is in leaf.cfg
  • c/src/exec/score/cpu/powerpc/Makefile.in

    r4cc89bd r38840f7b  
    6767install:  all
    6868
    69 preinstall: $(ARCH) \
    70             ${PROJECT_RELEASE}/lib/bsp_specs
     69preinstall: $(ARCH)
    7170        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
    7271# we will share the basic cpu file
     
    7574        #test -f irq_stub.s || $(LN) -s $(srcdir)/irq_stub.s irq_stub.s
    7675
    77 ${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    78         $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
    79 
    80 # $(ARCH)/bsp_specs.tmp rule is in leaf.cfg
  • c/src/exec/score/cpu/sh/Makefile.in

    r4cc89bd r38840f7b  
    7171install:  all
    7272
    73 preinstall: $(ARCH) \
    74             ${PROJECT_RELEASE}/lib/bsp_specs
     73preinstall: $(ARCH)
    7574        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
    7675# we will share the basic cpu file
    7776        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    78 
    79 ${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    80         $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
    81 
    82 # $(ARCH)/bsp_specs.tmp rule is in leaf.cfg
  • c/src/exec/score/cpu/sparc/Makefile.in

    r4cc89bd r38840f7b  
    5959all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
    6060
    61 preinstall: $(ARCH) \
    62             ${PROJECT_RELEASE}/lib/bsp_specs
     61preinstall: $(ARCH)
    6362        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
    6463# we will share the basic cpu file
    6564        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    6665
    67 ${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    68         $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
    69 
    70 # $(ARCH)/bsp_specs.tmp rule is in leaf.cfg
  • c/src/exec/score/cpu/unix/Makefile.in

    r4cc89bd r38840f7b  
    6565install:  all
    6666
    67 # Real ports using the gnu tools will need to have bsp_specs!!!
    68 #            ${PROJECT_RELEASE}/lib/bsp_specs
    69 preinstall: $(ARCH) $(ARCH)/unixsize.h \
    70             $(PROJECT_RELEASE)/lib/bsp_specs
     67preinstall: $(ARCH) $(ARCH)/unixsize.h
    7168        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
    7269        $(INSTALL) -m 444 ${ARCH}/unixsize.h $(PROJECT_INCLUDE)/rtems/score
    73 
    74 # Real ports using the gnu tools will need to have bsp_specs!!!
    75 ${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    76         $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
    77 #
    78 # $(ARCH)/bsp_specs.tmp rule is in leaf.cfg
  • make/leaf.cfg

    r4cc89bd r38840f7b  
    126126        $(RM) -r $(CLOBBER_OS) $(CLOBBER_CC) $(CLOBBER_DEPEND)
    127127        $(RM) -r $(CLOBBER_ADDITIONS) a.out
    128 
    129 ifeq ($(RTEMS_BSP),bare)
    130 $(ARCH)/bsp_specs.tmp: FORCE
    131         cp $(RTEMS_ROOT)/c/src/lib/libbsp/$(RTEMS_BSP_FAMILY)/bsp_specs $@
    132 else       
    133 $(ARCH)/bsp_specs.tmp: FORCE
    134         cp $(RTEMS_ROOT)/c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/bsp_specs $@
    135 endif
Note: See TracChangeset for help on using the changeset viewer.