Changeset 4d11a92f in rtems


Ignore:
Timestamp:
Aug 5, 1998, 3:11:33 PM (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
5094711
Parents:
b31fdf8
Message:

Redid Makefiles to properly do a preinstall. There was remnants of the
old way of setting th cpu family and model string names.

Location:
c/src/exec/score/cpu
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/score/cpu/a29k/Makefile.in

    rb31fdf8 r4d11a92f  
    1717C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
    1818
    19 H_FILES=$(srcdir)/cpu.h $(srcdir)/a29ktypes.h
     19H_FILES=$(srcdir)/cpu.h $(srcdir)/a29k.h $(srcdir)/a29ktypes.h
    2020
    2121# H_FILES that get installed externally
    22 # a29k.h is handled separately
    23 EXTERNAL_H_FILES = $(srcdir)/asm.h $(srcdir)/amd.ah $(srcdir)/pswmacro.ah $(srcdir)/register.ah
     22EXTERNAL_H_FILES = $(srcdir)/asm.h $(srcdir)/amd.ah \
     23      $(srcdir)/pswmacro.ah $(srcdir)/register.ah
    2424
    2525# Assembly source names, if any, go here -- minus the .s
     
    6666# for include files, just use $(INSTALL)
    6767
    68 preinstall: $(PROJECT_INCLUDE)/rtems/score/a29k.h \
     68preinstall: $(ARCH) \
    6969            $(PROJECT_INCLUDE)/rtems/score/targopts.h \
    7070            ${PROJECT_RELEASE}/lib/bsp_specs
     
    7272# we will share the basic cpu file
    7373        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    74 
    75 $(PROJECT_INCLUDE)/rtems/score/a29k.h: a29k.h
    76          $(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
    77                 -e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
    78       < $< >$(ARCH)/a29k.h.tmp
    79         $(INSTALL) -m 444 $(ARCH)/a29k.h.tmp $@
    8074
    8175$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
  • c/src/exec/score/cpu/hppa1.1/Makefile.in

    rb31fdf8 r4d11a92f  
    6363        $(make-rel)
    6464
    65 all:  ${ARCH} install-headers $(SRCS) $(ARCH)/offsets.h preinstall $(RELS)
     65all:  ${ARCH} install-headers preinstall $(RELS)
    6666
    67 preinstall:
     67preinstall: $(ARCH) $(SRCS) $(ARCH)/offsets.h
    6868        $(INSTALL) -m 444 $(ARCH)/offsets.h $(PROJECT_INCLUDE)/rtems/score
    6969
  • c/src/exec/score/cpu/i386/Makefile.in

    rb31fdf8 r4d11a92f  
    1616C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
    1717
    18 H_FILES=$(srcdir)/cpu.h $(srcdir)/i386types.h
     18H_FILES=$(srcdir)/cpu.h $(srcdir)/i386.h $(srcdir)/i386types.h
    1919
    2020# H_FILES that get installed externally
     
    6464install:  all
    6565
    66 preinstall: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/i386.h \
     66preinstall: $(ARCH) \
    6767            $(PROJECT_INCLUDE)/rtems/score/targopts.h \
    6868            ${PROJECT_RELEASE}/lib/bsp_specs
     
    7070# we will share the basic cpu file
    7171        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    72 
    73 $(PROJECT_INCLUDE)/rtems/score/i386.h: i386.h
    74         $(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
    75                 -e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
    76       < $< >$(ARCH)/i386.h-tmp
    77         $(INSTALL) -m 444 $(ARCH)/i386.h-tmp $@
    7872
    7973$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
  • c/src/exec/score/cpu/i960/Makefile.in

    rb31fdf8 r4d11a92f  
    1616C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
    1717
    18 H_FILES=$(srcdir)/cpu.h $(srcdir)/i960types.h
     18H_FILES=$(srcdir)/cpu.h $(srcdir)/i960.h $(srcdir)/i960types.h
    1919
    2020# H_FILES that get installed externally
    21 # i960.h is handled separately
    2221EXTERNAL_H_FILES = $(srcdir)/asm.h
    2322
     
    6463install:  all
    6564
    66 preinstall: $(PROJECT_INCLUDE)/rtems/score/i960.h \
     65preinstall: $(ARCH) \
    6766            $(PROJECT_INCLUDE)/rtems/score/targopts.h \
    6867            ${PROJECT_RELEASE}/lib/bsp_specs
     
    7069# we will share the basic cpu file
    7170        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    72 
    73 $(PROJECT_INCLUDE)/rtems/score/i960.h: i960.h
    74          $(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
    75                 -e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
    76       < $< >$(ARCH)/i960.h.tmp
    77         $(INSTALL) -m 444 $(ARCH)/i960.h.tmp $@
    7871
    7972$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
  • c/src/exec/score/cpu/m68k/Makefile.in

    rb31fdf8 r4d11a92f  
    6060all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
    6161
    62 preinstall: $(PROJECT_INCLUDE)/rtems/score/targopts.h \
     62preinstall: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/targopts.h \
    6363            ${PROJECT_RELEASE}/lib/bsp_specs
    6464        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
  • c/src/exec/score/cpu/mips64orion/Makefile.in

    rb31fdf8 r4d11a92f  
    6666# for include files, just use $(INSTALL)
    6767
    68 preinstall: $(PROJECT_INCLUDE)/rtems/score/targopts.h \
     68preinstall: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/targopts.h \
    6969            ${PROJECT_RELEASE}/lib/bsp_specs
    7070        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
  • c/src/exec/score/cpu/no_cpu/Makefile.in

    rb31fdf8 r4d11a92f  
    1717C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
    1818
    19 H_FILES=$(srcdir)/cpu.h $(srcdir)/no_cputypes.h
     19H_FILES=$(srcdir)/cpu.h $(srcdir)/no_cpu.h $(srcdir)/no_cputypes.h
    2020
    2121# H_FILES that get installed externally
    22 # no_cpu.h is handled separately
    2322EXTERNAL_H_FILES = $(srcdir)/asm.h
    2423
     
    6867# Real ports using the gnu tools will need to have bsp_specs!!!
    6968#            ${PROJECT_RELEASE}/lib/bsp_specs
    70 preinstall: $(PROJECT_INCLUDE)/rtems/score/no_cpu.h \
     69preinstall: $(ARCH) \
    7170            $(PROJECT_INCLUDE)/rtems/score/targopts.h
    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)
    75 
    76 $(PROJECT_INCLUDE)/rtems/score/no_cpu.h: $(srcdir)/no_cpu.h
    77          $(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
    78                 -e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
    79       <$(srcdir)/no_cpu.h >$(ARCH)/no_cpu.h.tmp
    80         $(INSTALL) -m 444 $(ARCH)/no_cpu.h.tmp $@
    8174
    8275$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
  • c/src/exec/score/cpu/powerpc/Makefile.in

    rb31fdf8 r4d11a92f  
    1717C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
    1818
    19 H_FILES=$(srcdir)/cpu.h $(srcdir)/ppctypes.h
     19H_FILES=$(srcdir)/cpu.h $(srcdir)/ppc.h $(srcdir)/ppctypes.h
    2020
    2121# H_FILES that get installed externally
    22 # ppc.h is handled separately
    2322EXTERNAL_H_FILES = $(srcdir)/asm.h
    2423
     
    6867install:  all
    6968
    70 preinstall: $(PROJECT_INCLUDE)/rtems/score/ppc.h \
     69preinstall: $(ARCH) \
    7170            $(PROJECT_INCLUDE)/rtems/score/targopts.h \
    7271            ${PROJECT_RELEASE}/lib/bsp_specs
     
    7675# make a link in case we are not compiling in the source directory
    7776        test -f irq_stub.s || $(LN) -s $(srcdir)/irq_stub.s irq_stub.s
    78 
    79 $(PROJECT_INCLUDE)/rtems/score/ppc.h: ppc.h
    80          $(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
    81                 -e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
    82       < $< >$(ARCH)/ppc.h.tmp
    83         $(INSTALL) -m 444 $(ARCH)/ppc.h.tmp $@
    8477
    8578$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
  • c/src/exec/score/cpu/sh/Makefile.in

    rb31fdf8 r4d11a92f  
    2525
    2626# H_FILES that get installed externally
    27 # sh.h is handled separately
    2827EXTERNAL_H_FILES = \
    2928        $(srcdir)/asm.h
     
    7271install:  all
    7372
    74 preinstall: $(PROJECT_INCLUDE)/rtems/score/targopts.h \
     73preinstall: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/targopts.h \
    7574            ${PROJECT_RELEASE}/lib/bsp_specs
    7675        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
  • c/src/exec/score/cpu/sparc/Makefile.in

    rb31fdf8 r4d11a92f  
    5959all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
    6060
    61 preinstall: $(PROJECT_INCLUDE)/rtems/score/targopts.h \
     61preinstall: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/targopts.h \
    6262            ${PROJECT_RELEASE}/lib/bsp_specs
    6363        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
  • c/src/exec/score/cpu/unix/Makefile.in

    rb31fdf8 r4d11a92f  
    1616C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
    1717
    18 H_FILES=$(srcdir)/cpu.h $(srcdir)/unixtypes.h
     18H_FILES=$(srcdir)/cpu.h $(srcdir)/unix.h $(srcdir)/unixtypes.h
    1919
    2020# Assembly source names, if any, go here -- minus the .S
     
    6767# Real ports using the gnu tools will need to have bsp_specs!!!
    6868#            ${PROJECT_RELEASE}/lib/bsp_specs
    69 preinstall: $(PROJECT_INCLUDE)/rtems/score/unix.h $(ARCH)/unixsize.h \
     69preinstall: $(ARCH) $(ARCH)/unixsize.h \
    7070            $(PROJECT_INCLUDE)/rtems/score/targopts.h \
    7171            $(PROJECT_RELEASE)/lib/bsp_specs
    7272        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
    7373        $(INSTALL) -m 444 ${ARCH}/unixsize.h $(PROJECT_INCLUDE)/rtems/score
    74 
    75 $(PROJECT_INCLUDE)/rtems/score/unix.h: unix.h
    76          $(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
    77                 -e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
    78                 -e 's?REPLACE_THIS_WITH_THE_CPU_FAMILY?$(RTEMS_CPU_FAMILY)?' \
    79                 -e 's?REPLACE_THIS_WITH_THE_UNIX_FLAVOR?$(RTEMS_UNIX_FLAVOR)?' \
    80       <$(srcdir)/unix.h >$(ARCH)/unix.h.tmp
    81         $(INSTALL) -m 444 $(ARCH)/unix.h.tmp $@
    8274
    8375$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
Note: See TracChangeset for help on using the changeset viewer.