RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Redid Makefiles to properly do a preinstall. There was remnants of the

Browse Source 
old way of setting th cpu family and model string names.
This commit is contained in:
Joel Sherrill
1998-08-05 15:11:33 +00:00
parent b31fdf8d03
commit 4d11a92f3e
11 changed files with 20 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
c/src/exec/score/cpu/a29k/Makefile.in
View File

@@ -16,11 +16,11 @@ C_PIECES=cpu rtems
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
H_FILES=$(srcdir)/cpu.h $(srcdir)/a29ktypes.h
H_FILES=$(srcdir)/cpu.h $(srcdir)/a29k.h $(srcdir)/a29ktypes.h
# H_FILES that get installed externally
# a29k.h is handled separately
EXTERNAL_H_FILES = $(srcdir)/asm.h $(srcdir)/amd.ah $(srcdir)/pswmacro.ah $(srcdir)/register.ah
EXTERNAL_H_FILES = $(srcdir)/asm.h $(srcdir)/amd.ah \
$(srcdir)/pswmacro.ah $(srcdir)/register.ah
# Assembly source names, if any, go here -- minus the .s
# Normally cpu_asm and rtems are assembly files
@@ -65,19 +65,13 @@ $(ARCH)/rtems-cpu.rel: $(OBJS)
# Install the program(s), appending _g or _p as appropriate.
# for include files, just use $(INSTALL)
preinstall: $(PROJECT_INCLUDE)/rtems/score/a29k.h \
preinstall: $(ARCH) \
$(PROJECT_INCLUDE)/rtems/score/targopts.h \
${PROJECT_RELEASE}/lib/bsp_specs
$(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_INCLUDE)/rtems/score/a29k.h: a29k.h
$(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
-e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
< $< >$(ARCH)/a29k.h.tmp
$(INSTALL) -m 444 $(ARCH)/a29k.h.tmp $@
$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@

4
c/src/exec/score/cpu/hppa1.1/Makefile.in
View File

@@ -62,9 +62,9 @@ $(ARCH)/offsets.h: $(ARCH) cpu.h $(PROJECT_RELEASE)/bin/genoffsets
$(ARCH)/rtems-cpu.rel: $(OBJS)
$(make-rel)
all: ${ARCH} install-headers $(SRCS) $(ARCH)/offsets.h preinstall $(RELS)
all: ${ARCH} install-headers preinstall $(RELS)
preinstall:
preinstall: $(ARCH) $(SRCS) $(ARCH)/offsets.h
$(INSTALL) -m 444 $(ARCH)/offsets.h $(PROJECT_INCLUDE)/rtems/score
install-headers: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/targopts.h \

10
c/src/exec/score/cpu/i386/Makefile.in
View File

@@ -15,7 +15,7 @@ C_PIECES=cpu
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
H_FILES=$(srcdir)/cpu.h $(srcdir)/i386types.h
H_FILES=$(srcdir)/cpu.h $(srcdir)/i386.h $(srcdir)/i386types.h
# H_FILES that get installed externally
# i386.h is handled specially
@@ -63,19 +63,13 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
# for include files, just use $(INSTALL)
install: all
preinstall: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/i386.h \
preinstall: $(ARCH) \
$(PROJECT_INCLUDE)/rtems/score/targopts.h \
${PROJECT_RELEASE}/lib/bsp_specs
$(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_INCLUDE)/rtems/score/i386.h: i386.h
$(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
-e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
< $< >$(ARCH)/i386.h-tmp
$(INSTALL) -m 444 $(ARCH)/i386.h-tmp $@
$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@

11
c/src/exec/score/cpu/i960/Makefile.in
View File

@@ -15,10 +15,9 @@ C_PIECES=cpu
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
H_FILES=$(srcdir)/cpu.h $(srcdir)/i960types.h
H_FILES=$(srcdir)/cpu.h $(srcdir)/i960.h $(srcdir)/i960types.h
# H_FILES that get installed externally
# i960.h is handled separately
EXTERNAL_H_FILES = $(srcdir)/asm.h
# Assembly source names, if any, go here -- minus the .s
@@ -63,19 +62,13 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
# for include files, just use $(INSTALL)
install: all
preinstall: $(PROJECT_INCLUDE)/rtems/score/i960.h \
preinstall: $(ARCH) \
$(PROJECT_INCLUDE)/rtems/score/targopts.h \
${PROJECT_RELEASE}/lib/bsp_specs
$(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_INCLUDE)/rtems/score/i960.h: i960.h
$(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
-e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
< $< >$(ARCH)/i960.h.tmp
$(INSTALL) -m 444 $(ARCH)/i960.h.tmp $@
$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@

2
c/src/exec/score/cpu/m68k/Makefile.in
View File

@@ -59,7 +59,7 @@ $(ARCH)/rtems-cpu.rel: $(OBJS)
all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
preinstall: $(PROJECT_INCLUDE)/rtems/score/targopts.h \
preinstall: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/targopts.h \
${PROJECT_RELEASE}/lib/bsp_specs
$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
# we will share the basic cpu file

2
c/src/exec/score/cpu/mips64orion/Makefile.in
View File

@@ -65,7 +65,7 @@ $(ARCH)/rtems-cpu.rel: $(OBJS)
# Install the program(s), appending _g or _p as appropriate.
# for include files, just use $(INSTALL)
preinstall: $(PROJECT_INCLUDE)/rtems/score/targopts.h \
preinstall: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/targopts.h \
${PROJECT_RELEASE}/lib/bsp_specs
$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
# we will share the basic cpu file

11
c/src/exec/score/cpu/no_cpu/Makefile.in
View File

@@ -16,10 +16,9 @@ C_PIECES=cpu cpu_asm rtems
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
H_FILES=$(srcdir)/cpu.h $(srcdir)/no_cputypes.h
H_FILES=$(srcdir)/cpu.h $(srcdir)/no_cpu.h $(srcdir)/no_cputypes.h
# H_FILES that get installed externally
# no_cpu.h is handled separately
EXTERNAL_H_FILES = $(srcdir)/asm.h
# Assembly source names, if any, go here -- minus the .s
@@ -67,18 +66,12 @@ install: all
# Real ports using the gnu tools will need to have bsp_specs!!!
# ${PROJECT_RELEASE}/lib/bsp_specs
preinstall: $(PROJECT_INCLUDE)/rtems/score/no_cpu.h \
preinstall: $(ARCH) \
$(PROJECT_INCLUDE)/rtems/score/targopts.h
$(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_INCLUDE)/rtems/score/no_cpu.h: $(srcdir)/no_cpu.h
$(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
-e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
<$(srcdir)/no_cpu.h >$(ARCH)/no_cpu.h.tmp
$(INSTALL) -m 444 $(ARCH)/no_cpu.h.tmp $@
$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@

11
c/src/exec/score/cpu/powerpc/Makefile.in
View File

@@ -16,10 +16,9 @@ C_PIECES=cpu
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
H_FILES=$(srcdir)/cpu.h $(srcdir)/ppctypes.h
H_FILES=$(srcdir)/cpu.h $(srcdir)/ppc.h $(srcdir)/ppctypes.h
# H_FILES that get installed externally
# ppc.h is handled separately
EXTERNAL_H_FILES = $(srcdir)/asm.h
# Assembly source names, if any, go here -- minus the .s
@@ -67,7 +66,7 @@ $(ARCH)/cpu_asm.o: irq_stub.s
# for include files, just use $(INSTALL)
install: all
preinstall: $(PROJECT_INCLUDE)/rtems/score/ppc.h \
preinstall: $(ARCH) \
$(PROJECT_INCLUDE)/rtems/score/targopts.h \
${PROJECT_RELEASE}/lib/bsp_specs
$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
@@ -76,12 +75,6 @@ preinstall: $(PROJECT_INCLUDE)/rtems/score/ppc.h \
# 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_INCLUDE)/rtems/score/ppc.h: ppc.h
$(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
-e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
< $< >$(ARCH)/ppc.h.tmp
$(INSTALL) -m 444 $(ARCH)/ppc.h.tmp $@
$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@

3
c/src/exec/score/cpu/sh/Makefile.in
View File

@@ -24,7 +24,6 @@ H_FILES= \
$(srcdir)/iosh7030.h
# H_FILES that get installed externally
# sh.h is handled separately
EXTERNAL_H_FILES = \
$(srcdir)/asm.h
@@ -71,7 +70,7 @@ $(ARCH)/rtems-cpu.rel: $(OBJS)
# for include files, just use $(INSTALL)
install: all
preinstall: $(PROJECT_INCLUDE)/rtems/score/targopts.h \
preinstall: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/targopts.h \
${PROJECT_RELEASE}/lib/bsp_specs
$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
# we will share the basic cpu file

2
c/src/exec/score/cpu/sparc/Makefile.in
View File

@@ -58,7 +58,7 @@ $(ARCH)/rtems-cpu.rel: $(OBJS)
all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
preinstall: $(PROJECT_INCLUDE)/rtems/score/targopts.h \
preinstall: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/targopts.h \
${PROJECT_RELEASE}/lib/bsp_specs
$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
# we will share the basic cpu file

12
c/src/exec/score/cpu/unix/Makefile.in
View File

@@ -15,7 +15,7 @@ C_PIECES=cpu
C_FILES=$(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
H_FILES=$(srcdir)/cpu.h $(srcdir)/unixtypes.h
H_FILES=$(srcdir)/cpu.h $(srcdir)/unix.h $(srcdir)/unixtypes.h
# Assembly source names, if any, go here -- minus the .S
S_PIECES=
@@ -66,20 +66,12 @@ install: all
# Real ports using the gnu tools will need to have bsp_specs!!!
# ${PROJECT_RELEASE}/lib/bsp_specs
preinstall: $(PROJECT_INCLUDE)/rtems/score/unix.h $(ARCH)/unixsize.h \
preinstall: $(ARCH) $(ARCH)/unixsize.h \
$(PROJECT_INCLUDE)/rtems/score/targopts.h \
$(PROJECT_RELEASE)/lib/bsp_specs
$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
$(INSTALL) -m 444 ${ARCH}/unixsize.h $(PROJECT_INCLUDE)/rtems/score
$(PROJECT_INCLUDE)/rtems/score/unix.h: unix.h
$(SED) -e 's?REPLACE_THIS_WITH_THE_CPU_MODEL?$(RTEMS_CPU_MODEL)?' \
-e 's?REPLACE_THIS_WITH_THE_BSP?$(RTEMS_BSP)?' \
-e 's?REPLACE_THIS_WITH_THE_CPU_FAMILY?$(RTEMS_CPU_FAMILY)?' \
-e 's?REPLACE_THIS_WITH_THE_UNIX_FLAVOR?$(RTEMS_UNIX_FLAVOR)?' \
<$(srcdir)/unix.h >$(ARCH)/unix.h.tmp
$(INSTALL) -m 444 $(ARCH)/unix.h.tmp $@
$(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
$(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@