From 4e36a2f133c68aaf637e166385eff1a05b59f38e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 31 Jan 2000 15:27:02 +0000 Subject: Patches rtems-rc-20000118-3.diff and rtems-rc-20000118-4.diff from Ralf Corsepius that contain: * Modifications, (minor) corrections, cleanups to most existing Makefile.ams * Adds automake support to all remaining BSPs which have not yet been converted to automake. * Makefile.am for all remaining wrapup/Makefile.ams --- c/src/exec/score/cpu/a29k/Makefile.am | 33 +++++++++--------- c/src/exec/score/cpu/hppa1.1/Makefile.am | 37 +++++++++----------- c/src/exec/score/cpu/i386/Makefile.am | 39 ++++++++++------------ c/src/exec/score/cpu/i960/Makefile.am | 35 +++++++++---------- c/src/exec/score/cpu/m68k/Makefile.am | 36 +++++++++----------- c/src/exec/score/cpu/mips/Makefile.am | 36 +++++++++----------- c/src/exec/score/cpu/mips64orion/Makefile.am | 36 +++++++++----------- c/src/exec/score/cpu/no_cpu/Makefile.am | 38 +++++++++------------ c/src/exec/score/cpu/powerpc/Makefile.am | 4 +-- .../powerpc/new_exception_processing/Makefile.am | 2 -- c/src/exec/score/cpu/sh/Makefile.am | 30 +++++++---------- c/src/exec/score/cpu/sparc/Makefile.am | 39 ++++++++++------------ c/src/exec/score/cpu/unix/Makefile.am | 14 ++++---- 13 files changed, 165 insertions(+), 214 deletions(-) (limited to 'c/src/exec/score/cpu') diff --git a/c/src/exec/score/cpu/a29k/Makefile.am b/c/src/exec/score/cpu/a29k/Makefile.am index ee69311ec8..a740e396a3 100644 --- a/c/src/exec/score/cpu/a29k/Makefile.am +++ b/c/src/exec/score/cpu/a29k/Makefile.am @@ -10,20 +10,16 @@ include $(top_srcdir)/../../../../../../automake/lib.am SUBDIRS = rtems -# C source names C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = amd.ah asm.h cpu_asm.h pswmacro.ah register.ah -noinst_HEADERS = $(H_FILES) -# S source names S_FILES = cpu_asm.S sig.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(H_FILES:%=$(PROJECT_INCLUDE)/%) +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -31,23 +27,26 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o - $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ REL = $(ARCH)/rtems-cpu.rel -$(REL): $(C_O_FILES) $(S_O_FILES) +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) + +$(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) + +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES) + +.PRECIOUS: $(REL) -EXTRA_DIST = \ -cpu.c \ -cpu_asm.S sig.S \ -rtems.c +EXTRA_DIST = amd.ah asm.h cpu.c cpu_asm.S pswmacro.ah register.ah rtems.c \ + sig.S include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/hppa1.1/Makefile.am b/c/src/exec/score/cpu/hppa1.1/Makefile.am index 2adb4f8eed..882f9ca597 100644 --- a/c/src/exec/score/cpu/hppa1.1/Makefile.am +++ b/c/src/exec/score/cpu/hppa1.1/Makefile.am @@ -5,25 +5,16 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../../../automake/lib.am - SUBDIRS = rtems -# C source names C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -## H_FILES = -## noinst_HEADERS = $(H_FILES) - -# S source names S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(H_FILES:%=$(PROJECT_INCLUDE)/%) +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -31,23 +22,25 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o - $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ REL = $(ARCH)/rtems-cpu.rel -$(REL): $(C_O_FILES) $(S_O_FILES) +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) + +$(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) + +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES) + +.PRECIOUS: $(REL) -EXTRA_DIST = \ -cpu.c \ -cpu_asm.S \ -rtems.S +EXTRA_DIST = cpu.c cpu_asm.S rtems.S include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/i386/Makefile.am b/c/src/exec/score/cpu/i386/Makefile.am index 4e989e3488..ff1f7dd610 100644 --- a/c/src/exec/score/cpu/i386/Makefile.am +++ b/c/src/exec/score/cpu/i386/Makefile.am @@ -5,25 +5,22 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../../../automake/lib.am - SUBDIRS = rtems -# C source names +REL = $(ARCH)/rtems-cpu.rel + C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = asm.h -noinst_HEADERS = $(H_FILES) -# S source names S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(H_FILES:%=$(PROJECT_INCLUDE)/%) +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -31,23 +28,21 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o - $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ -REL = $(ARCH)/rtems-cpu.rel - -$(REL): $(C_O_FILES) $(S_O_FILES) +$(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) + +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES) + +.PRECIOUS: $(REL) -EXTRA_DIST = \ -cpu.c \ -cpu_asm.S \ -rtems.S +EXTRA_DIST = asm.h cpu.c cpu_asm.S rtems.S include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/i960/Makefile.am b/c/src/exec/score/cpu/i960/Makefile.am index 5dfd2a4303..9e45e1dcd4 100644 --- a/c/src/exec/score/cpu/i960/Makefile.am +++ b/c/src/exec/score/cpu/i960/Makefile.am @@ -5,25 +5,18 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../../../automake/lib.am - SUBDIRS = rtems -# C source names C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = asm.h i960RP.h -noinst_HEADERS = $(H_FILES) -# S source names S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(H_FILES:%=$(PROJECT_INCLUDE)/%) +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -31,23 +24,25 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o - $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ REL = $(ARCH)/rtems-cpu.rel -$(REL): $(C_O_FILES) $(S_O_FILES) +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) + +$(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) + +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES) + +.PRECIOUS: $(REL) -EXTRA_DIST = \ -cpu.c \ -cpu_asm.S \ -rtems.S +EXTRA_DIST = asm.h cpu.c cpu_asm.S i960RP.h rtems.S include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/m68k/Makefile.am b/c/src/exec/score/cpu/m68k/Makefile.am index 307eefc86e..4ff7a91ff7 100644 --- a/c/src/exec/score/cpu/m68k/Makefile.am +++ b/c/src/exec/score/cpu/m68k/Makefile.am @@ -5,25 +5,18 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../../../automake/lib.am - SUBDIRS = rtems -# C source names C_FILES = cpu.c memcpy.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = asm.h m68302.h m68360.h qsm.h sim.h -noinst_HEADERS = $(H_FILES) -# S source names S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(H_FILES:%=$(PROJECT_INCLUDE)/%) +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -31,23 +24,26 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o - $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ REL = $(ARCH)/rtems-cpu.rel -$(REL): $(C_O_FILES) $(S_O_FILES) +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) + +$(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) + +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES) + +.PRECIOUS: $(REL) -EXTRA_DIST = \ -cpu.c memcpy.c \ -cpu_asm.S \ -rtems.S +EXTRA_DIST = asm.h cpu.c cpu_asm.S m68302.h m68360.h memcpy.c qsm.h rtems.S \ + sim.h include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/mips/Makefile.am b/c/src/exec/score/cpu/mips/Makefile.am index 2909324c08..b54cb49ded 100644 --- a/c/src/exec/score/cpu/mips/Makefile.am +++ b/c/src/exec/score/cpu/mips/Makefile.am @@ -5,25 +5,18 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../../../automake/lib.am - SUBDIRS = rtems -# C source names C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = asm.h cpu_asm.h idtcpu.h idtmon.h iregdef.h -noinst_HEADERS = $(H_FILES) -# S source names S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(H_FILES:%=$(PROJECT_INCLUDE)/%) +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -31,23 +24,26 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o - $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ REL = $(ARCH)/rtems-cpu.rel -$(REL): $(C_O_FILES) $(S_O_FILES) +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) + +$(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) + +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES) + +.PRECIOUS: $(REL) -EXTRA_DIST = \ -cpu.c \ -cpu_asm.S \ -rtems.c +EXTRA_DIST = asm.h cpu.c cpu_asm.S cpu_asm.h idtcpu.h idtmon.h iregdef.h \ + rtems.c include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/mips64orion/Makefile.am b/c/src/exec/score/cpu/mips64orion/Makefile.am index 2909324c08..b54cb49ded 100644 --- a/c/src/exec/score/cpu/mips64orion/Makefile.am +++ b/c/src/exec/score/cpu/mips64orion/Makefile.am @@ -5,25 +5,18 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../../../automake/lib.am - SUBDIRS = rtems -# C source names C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = asm.h cpu_asm.h idtcpu.h idtmon.h iregdef.h -noinst_HEADERS = $(H_FILES) -# S source names S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(H_FILES:%=$(PROJECT_INCLUDE)/%) +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -31,23 +24,26 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o - $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ REL = $(ARCH)/rtems-cpu.rel -$(REL): $(C_O_FILES) $(S_O_FILES) +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) + +$(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) + +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES) + +.PRECIOUS: $(REL) -EXTRA_DIST = \ -cpu.c \ -cpu_asm.S \ -rtems.c +EXTRA_DIST = asm.h cpu.c cpu_asm.S cpu_asm.h idtcpu.h idtmon.h iregdef.h \ + rtems.c include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/no_cpu/Makefile.am b/c/src/exec/score/cpu/no_cpu/Makefile.am index d3ba497313..29ff8e77ff 100644 --- a/c/src/exec/score/cpu/no_cpu/Makefile.am +++ b/c/src/exec/score/cpu/no_cpu/Makefile.am @@ -5,25 +5,19 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../../../automake/lib.am - SUBDIRS = rtems -# C source names C_FILES = cpu.c cpu_asm.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = asm.h -noinst_HEADERS = $(H_FILES) -# S source names -## S_FILES = cpu_asm.S -## S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +REL = $(ARCH)/rtems-cpu.rel -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(H_FILES:%=$(PROJECT_INCLUDE)/%) +rtems_cpu_rel_OBJECTS = $(C_O_FILES) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -31,23 +25,21 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o - $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ -REL = $(ARCH)/rtems-cpu.rel - -$(REL): $(C_O_FILES) $(S_O_FILES) +$(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) + +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES) + +.PRECIOUS: $(REL) -EXTRA_DIST = \ -cpu.c \ -cpu_asm.c \ -rtems.c +EXTRA_DIST = asm.h cpu.c cpu_asm.c rtems.c include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/powerpc/Makefile.am b/c/src/exec/score/cpu/powerpc/Makefile.am index cbddc2bca7..db1cf0888a 100644 --- a/c/src/exec/score/cpu/powerpc/Makefile.am +++ b/c/src/exec/score/cpu/powerpc/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal diff --git a/c/src/exec/score/cpu/powerpc/new_exception_processing/Makefile.am b/c/src/exec/score/cpu/powerpc/new_exception_processing/Makefile.am index f7299a4103..c3195b159d 100644 --- a/c/src/exec/score/cpu/powerpc/new_exception_processing/Makefile.am +++ b/c/src/exec/score/cpu/powerpc/new_exception_processing/Makefile.am @@ -4,7 +4,6 @@ AUTOMAKE_OPTIONS = foreign 1.4 -# C source names, if any, go here -- minus the .c C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) @@ -12,7 +11,6 @@ ROOT_H_FILES = RTEMS_SCORE_H_FILES = cpu.h c_isr.inl noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES) -# Assembly source names, if any, go here -- minus the .S S_FILES = cpu_asm.S S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) diff --git a/c/src/exec/score/cpu/sh/Makefile.am b/c/src/exec/score/cpu/sh/Makefile.am index e03b4aaff3..680b7151dc 100644 --- a/c/src/exec/score/cpu/sh/Makefile.am +++ b/c/src/exec/score/cpu/sh/Makefile.am @@ -11,11 +11,6 @@ include $(top_srcdir)/../../../../../../automake/lib.am SUBDIRS = rtems H_FILES = asm.h -noinst_HEADERS = $(H_FILES) - -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(H_FILES:%=$(PROJECT_INCLUDE)/%) $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -23,29 +18,28 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o - $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ -# C source names, if any, go here -- minus the .c C_FILES = cpu.c cpu_asm.c isp$(RTEMS_CPU_MODEL).c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) REL = $(ARCH)/rtems-cpu.rel -$(REL): $(C_O_FILES) +rtems_cpu_rel_OBJECTS = $(C_O_FILES) + +$(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -all: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) + +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES) + +.PRECIOUS: $(REL) -EXTRA_DIST = \ -cpu.c \ -cpu_asm.c \ -ispsh7032.c \ -ispsh7045.c \ -rtems.c +EXTRA_DIST = asm.h cpu.c cpu_asm.c ispsh7032.c ispsh7045.c rtems.c include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/sparc/Makefile.am b/c/src/exec/score/cpu/sparc/Makefile.am index b3c1176884..6ae4472920 100644 --- a/c/src/exec/score/cpu/sparc/Makefile.am +++ b/c/src/exec/score/cpu/sparc/Makefile.am @@ -5,25 +5,22 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../../../automake/lib.am - SUBDIRS = rtems -# C source names C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = asm.h erc32.h -noinst_HEADERS = $(H_FILES) -# S source names S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + +REL = $(ARCH)/rtems-cpu.rel + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(H_FILES:%=$(PROJECT_INCLUDE)/%) +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -31,23 +28,21 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o - $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ -REL = $(ARCH)/rtems-cpu.rel - -$(REL): $(C_O_FILES) $(S_O_FILES) +$(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) + +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES) + +.PRECIOUS: $(REL) -EXTRA_DIST = \ -cpu.c \ -cpu_asm.S \ -rtems.S +EXTRA_DIST = asm.h cpu.c cpu_asm.S erc32.h rtems.S include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/unix/Makefile.am b/c/src/exec/score/cpu/unix/Makefile.am index d55b67a02c..e619852a38 100644 --- a/c/src/exec/score/cpu/unix/Makefile.am +++ b/c/src/exec/score/cpu/unix/Makefile.am @@ -12,19 +12,21 @@ SUBDIRS = rtems AM_CPPFLAGS = -DCPU_SYNC_IO $(LIBC_DEFINES) -# C source names, if any, go here -- minus the .c C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) REL = $(ARCH)/rtems-cpu.rel -$(REL): $(C_O_FILES) +rtems_cpu_rel_OBJECTS = $(C_O_FILES) + +$(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -all-local: $(ARCH) $(REL) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(rtems_cpu_rel_OBJECTS) $(REL) + +.PRECIOUS: $(REL) -EXTRA_DIST = \ -cpu.c +EXTRA_DIST = cpu.c include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am -- cgit v1.2.3