From 14926c2e4b5f64755e63d9fcb813501b2f5ae9ac Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 30 Jan 2002 17:48:22 +0000 Subject: 2002-01-29 Ralf Corsepius * rtems/Makefile.am: Removed. * rtems/score/Makefile.am: Removed. * configure.ac: Reflect changes above. * Makefile.am: Reflect changes above. --- c/src/exec/score/cpu/a29k/ChangeLog | 7 +++ c/src/exec/score/cpu/a29k/Makefile.am | 44 +++++++++++-------- c/src/exec/score/cpu/a29k/configure.ac | 4 +- c/src/exec/score/cpu/a29k/rtems/Makefile.am | 10 ----- c/src/exec/score/cpu/a29k/rtems/score/Makefile.am | 26 ----------- c/src/exec/score/cpu/arm/ChangeLog | 7 +++ c/src/exec/score/cpu/arm/Makefile.am | 50 +++++++++++++--------- c/src/exec/score/cpu/arm/rtems/Makefile.am | 10 ----- c/src/exec/score/cpu/arm/rtems/score/Makefile.am | 25 ----------- c/src/exec/score/cpu/c4x/ChangeLog | 7 +++ c/src/exec/score/cpu/c4x/Makefile.am | 49 +++++++++++++-------- c/src/exec/score/cpu/c4x/configure.ac | 4 +- c/src/exec/score/cpu/c4x/rtems/Makefile.am | 10 ----- c/src/exec/score/cpu/c4x/rtems/score/Makefile.am | 25 ----------- c/src/exec/score/cpu/h8300/ChangeLog | 7 +++ c/src/exec/score/cpu/h8300/Makefile.am | 48 +++++++++++++-------- c/src/exec/score/cpu/h8300/configure.ac | 4 +- c/src/exec/score/cpu/h8300/rtems/Makefile.am | 10 ----- c/src/exec/score/cpu/h8300/rtems/score/Makefile.am | 25 ----------- c/src/exec/score/cpu/hppa1.1/rtems/Makefile.am | 0 .../exec/score/cpu/hppa1.1/rtems/score/Makefile.am | 0 c/src/exec/score/cpu/i960/rtems/Makefile.am | 0 c/src/exec/score/cpu/i960/rtems/score/Makefile.am | 0 c/src/exec/score/cpu/m68k/rtems/Makefile.am | 0 c/src/exec/score/cpu/m68k/rtems/score/Makefile.am | 0 c/src/exec/score/cpu/mips64orion/rtems/Makefile.am | 0 .../score/cpu/mips64orion/rtems/score/Makefile.am | 0 c/src/exec/score/cpu/no_cpu/rtems/Makefile.am | 0 .../exec/score/cpu/no_cpu/rtems/score/Makefile.am | 0 cpukit/score/cpu/a29k/ChangeLog | 7 +++ cpukit/score/cpu/a29k/Makefile.am | 44 +++++++++++-------- cpukit/score/cpu/a29k/configure.ac | 4 +- cpukit/score/cpu/arm/ChangeLog | 7 +++ cpukit/score/cpu/arm/Makefile.am | 50 +++++++++++++--------- cpukit/score/cpu/c4x/ChangeLog | 7 +++ cpukit/score/cpu/c4x/Makefile.am | 49 +++++++++++++-------- cpukit/score/cpu/c4x/configure.ac | 4 +- cpukit/score/cpu/h8300/ChangeLog | 7 +++ cpukit/score/cpu/h8300/Makefile.am | 48 +++++++++++++-------- cpukit/score/cpu/h8300/configure.ac | 4 +- cpukit/score/cpu/mips64orion/ChangeLog | 7 +++ cpukit/score/cpu/mips64orion/Makefile.am | 42 +++++++++++------- cpukit/score/cpu/mips64orion/configure.ac | 4 +- 43 files changed, 326 insertions(+), 330 deletions(-) delete mode 100644 c/src/exec/score/cpu/a29k/rtems/Makefile.am delete mode 100644 c/src/exec/score/cpu/a29k/rtems/score/Makefile.am delete mode 100644 c/src/exec/score/cpu/arm/rtems/Makefile.am delete mode 100644 c/src/exec/score/cpu/arm/rtems/score/Makefile.am delete mode 100644 c/src/exec/score/cpu/c4x/rtems/Makefile.am delete mode 100644 c/src/exec/score/cpu/c4x/rtems/score/Makefile.am delete mode 100644 c/src/exec/score/cpu/h8300/rtems/Makefile.am delete mode 100644 c/src/exec/score/cpu/h8300/rtems/score/Makefile.am delete mode 100644 c/src/exec/score/cpu/hppa1.1/rtems/Makefile.am delete mode 100644 c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.am delete mode 100644 c/src/exec/score/cpu/i960/rtems/Makefile.am delete mode 100644 c/src/exec/score/cpu/i960/rtems/score/Makefile.am delete mode 100644 c/src/exec/score/cpu/m68k/rtems/Makefile.am delete mode 100644 c/src/exec/score/cpu/m68k/rtems/score/Makefile.am delete mode 100644 c/src/exec/score/cpu/mips64orion/rtems/Makefile.am delete mode 100644 c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.am delete mode 100644 c/src/exec/score/cpu/no_cpu/rtems/Makefile.am delete mode 100644 c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.am diff --git a/c/src/exec/score/cpu/a29k/ChangeLog b/c/src/exec/score/cpu/a29k/ChangeLog index 85680e5af8..a355f0ac53 100644 --- a/c/src/exec/score/cpu/a29k/ChangeLog +++ b/c/src/exec/score/cpu/a29k/ChangeLog @@ -1,3 +1,10 @@ +2002-01-29 Ralf Corsepius + + * rtems/Makefile.am: Removed. + * rtems/score/Makefile.am: Removed. + * configure.ac: Reflect changes above. + * Makefile.am: Reflect changes above. + 2001-12-19 Ralf Corsepius * Makefile.am: Add multilib support. diff --git a/c/src/exec/score/cpu/a29k/Makefile.am b/c/src/exec/score/cpu/a29k/Makefile.am index b261f7ab6f..a6646c0d25 100644 --- a/c/src/exec/score/cpu/a29k/Makefile.am +++ b/c/src/exec/score/cpu/a29k/Makefile.am @@ -2,35 +2,46 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -include_HEADERS = amd.ah asm.h pswmacro.ah register.ah - -S_FILES = cpu_asm.S sig.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) - include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems: + $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.ah: %.ah - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +include_HEADERS = amd.ah asm.h pswmacro.ah register.ah +PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = \ + rtems/score/a29k.h \ + rtems/score/a29ktypes.h \ + rtems/score/cpu.h \ + rtems/score/cpu_asm.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ +C_FILES = cpu.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +S_FILES = cpu_asm.S sig.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + REL = $(ARCH)/rtems-cpu.rel rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) @@ -38,8 +49,6 @@ rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ @@ -49,5 +58,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = cpu.c cpu_asm.S rtems.c sig.S -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/a29k/configure.ac b/c/src/exec/score/cpu/a29k/configure.ac index af3174a5df..32de91d930 100644 --- a/c/src/exec/score/cpu/a29k/configure.ac +++ b/c/src/exec/score/cpu/a29k/configure.ac @@ -26,7 +26,5 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_NEWLIB # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -rtems/Makefile -rtems/score/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/exec/score/cpu/a29k/rtems/Makefile.am b/c/src/exec/score/cpu/a29k/rtems/Makefile.am deleted file mode 100644 index ef7df82af7..0000000000 --- a/c/src/exec/score/cpu/a29k/rtems/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -SUBDIRS = score - -include $(top_srcdir)/../../../../../../automake/subdirs.am -include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/a29k/rtems/score/Makefile.am b/c/src/exec/score/cpu/a29k/rtems/score/Makefile.am deleted file mode 100644 index cff21e3476..0000000000 --- a/c/src/exec/score/cpu/a29k/rtems/score/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_rtems_scoredir = $(includedir)/rtems/score - -include_rtems_score_HEADERS = a29k.h a29ktypes.h cpu.h cpu_asm.h - -# -# (OPTIONAL) Add local stuff here using += -# - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) - -$(PROJECT_INCLUDE)/rtems/score: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/rtems/score/%.h: %.h - $(INSTALL_DATA) $< $@ - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/arm/ChangeLog b/c/src/exec/score/cpu/arm/ChangeLog index b2a6cbe020..ba2e9758c8 100644 --- a/c/src/exec/score/cpu/arm/ChangeLog +++ b/c/src/exec/score/cpu/arm/ChangeLog @@ -1,3 +1,10 @@ +2002-01-29 Ralf Corsepius + + * rtems/Makefile.am: Removed. + * rtems/score/Makefile.am: Removed. + * configure.ac: Reflect changes above. + * Makefile.am: Reflect changes above. + 2002-02-05 Ralf Corsepius * configure.ac: Remove RTEMS_CHECK_CUSTOM_BSP. diff --git a/c/src/exec/score/cpu/arm/Makefile.am b/c/src/exec/score/cpu/arm/Makefile.am index 793fcebfea..90f4bff821 100644 --- a/c/src/exec/score/cpu/arm/Makefile.am +++ b/c/src/exec/score/cpu/arm/Makefile.am @@ -2,41 +2,52 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) - -include_HEADERS = asm.h - -REL = $(ARCH)/rtems-cpu.rel - -rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) - include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +include_HEADERS = asm.h +PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = \ + rtems/score/cpu.h \ + rtems/score/arm.h \ + rtems/score/armtypes.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ +C_FILES = cpu.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + +REL = $(ARCH)/rtems-cpu.rel + +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) + $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ @@ -46,5 +57,4 @@ all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = cpu.c cpu_asm.S -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/arm/rtems/Makefile.am b/c/src/exec/score/cpu/arm/rtems/Makefile.am deleted file mode 100644 index ef7df82af7..0000000000 --- a/c/src/exec/score/cpu/arm/rtems/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -SUBDIRS = score - -include $(top_srcdir)/../../../../../../automake/subdirs.am -include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/arm/rtems/score/Makefile.am b/c/src/exec/score/cpu/arm/rtems/score/Makefile.am deleted file mode 100644 index cfe63cd034..0000000000 --- a/c/src/exec/score/cpu/arm/rtems/score/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = cpu.h arm.h armtypes.h - -# -# (OPTIONAL) Add local stuff here using += -# - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) - -$(PROJECT_INCLUDE)/rtems/score: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/rtems/score/%.h: %.h - $(INSTALL_DATA) $< $@ - -all: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/c4x/ChangeLog b/c/src/exec/score/cpu/c4x/ChangeLog index 91b0ed71a9..b0b7ea7ae2 100644 --- a/c/src/exec/score/cpu/c4x/ChangeLog +++ b/c/src/exec/score/cpu/c4x/ChangeLog @@ -1,3 +1,10 @@ +2002-01-29 Ralf Corsepius + + * rtems/Makefile.am: Removed. + * rtems/score/Makefile.am: Removed. + * configure.ac: Reflect changes above. + * Makefile.am: Reflect changes above. + 2002-02-09 Ralf Corsepius * asm.h: Remove #include . diff --git a/c/src/exec/score/cpu/c4x/Makefile.am b/c/src/exec/score/cpu/c4x/Makefile.am index 42fbae6fd9..570cca9316 100644 --- a/c/src/exec/score/cpu/c4x/Makefile.am +++ b/c/src/exec/score/cpu/c4x/Makefile.am @@ -2,41 +2,53 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -C_FILES = cpu.c irq.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -include_HEADERS = asm.h c4xio.h - -S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) - -REL = $(ARCH)/rtems-cpu.rel - include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am -rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +include_HEADERS = asm.h c4xio.h +PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = \ + rtems/score/cpu.h \ + rtems/score/c4x.h \ + rtems/score/c4xtypes.h \ + rtems/score/cpu_asm.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ +C_FILES = cpu.c irq.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + +REL = $(ARCH)/rtems-cpu.rel + +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) + $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ @@ -46,5 +58,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = cpu.c irq.c cpu_asm.S rtems.c -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/c4x/configure.ac b/c/src/exec/score/cpu/c4x/configure.ac index 78d654425a..8fcf090eab 100644 --- a/c/src/exec/score/cpu/c4x/configure.ac +++ b/c/src/exec/score/cpu/c4x/configure.ac @@ -26,7 +26,5 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_NEWLIB # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -rtems/Makefile -rtems/score/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/exec/score/cpu/c4x/rtems/Makefile.am b/c/src/exec/score/cpu/c4x/rtems/Makefile.am deleted file mode 100644 index ef7df82af7..0000000000 --- a/c/src/exec/score/cpu/c4x/rtems/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -SUBDIRS = score - -include $(top_srcdir)/../../../../../../automake/subdirs.am -include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/c4x/rtems/score/Makefile.am b/c/src/exec/score/cpu/c4x/rtems/score/Makefile.am deleted file mode 100644 index 97473d70de..0000000000 --- a/c/src/exec/score/cpu/c4x/rtems/score/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = cpu.h c4x.h c4xtypes.h cpu_asm.h - -# -# (OPTIONAL) Add local stuff here using += -# - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) - -$(PROJECT_INCLUDE)/rtems/score: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/rtems/score/%.h: %.h - $(INSTALL_DATA) $< $@ - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/h8300/ChangeLog b/c/src/exec/score/cpu/h8300/ChangeLog index 00f6aa79c7..1d7544936d 100644 --- a/c/src/exec/score/cpu/h8300/ChangeLog +++ b/c/src/exec/score/cpu/h8300/ChangeLog @@ -1,3 +1,10 @@ +2002-01-29 Ralf Corsepius + + * rtems/Makefile.am: Removed. + * rtems/score/Makefile.am: Removed. + * configure.ac: Reflect changes above. + * Makefile.am: Reflect changes above. + 2002-01-07 Ralf Corsepius * rtems/score/cpu.h: #include . diff --git a/c/src/exec/score/cpu/h8300/Makefile.am b/c/src/exec/score/cpu/h8300/Makefile.am index 2872868ec7..0f2140197a 100644 --- a/c/src/exec/score/cpu/h8300/Makefile.am +++ b/c/src/exec/score/cpu/h8300/Makefile.am @@ -2,41 +2,52 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -C_FILES = cpu.c rtems.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -include_HEADERS = asm.h - -S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) - -REL = $(ARCH)/rtems-cpu.rel - include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am -rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +include_HEADERS = asm.h +PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = \ + rtems/score/cpu.h \ + rtems/score/h8300.h \ + rtems/score/h8300types.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ +C_FILES = cpu.c rtems.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + +REL = $(ARCH)/rtems-cpu.rel + +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) + $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ @@ -46,5 +57,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = cpu.c cpu_asm.S rtems.c -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/h8300/configure.ac b/c/src/exec/score/cpu/h8300/configure.ac index 883a43a96a..b7dd21c883 100644 --- a/c/src/exec/score/cpu/h8300/configure.ac +++ b/c/src/exec/score/cpu/h8300/configure.ac @@ -26,7 +26,5 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_NEWLIB # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -rtems/Makefile -rtems/score/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/exec/score/cpu/h8300/rtems/Makefile.am b/c/src/exec/score/cpu/h8300/rtems/Makefile.am deleted file mode 100644 index ef7df82af7..0000000000 --- a/c/src/exec/score/cpu/h8300/rtems/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -SUBDIRS = score - -include $(top_srcdir)/../../../../../../automake/subdirs.am -include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/h8300/rtems/score/Makefile.am b/c/src/exec/score/cpu/h8300/rtems/score/Makefile.am deleted file mode 100644 index f8dc349940..0000000000 --- a/c/src/exec/score/cpu/h8300/rtems/score/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = cpu.h h8300.h h8300types.h - -# -# (OPTIONAL) Add local stuff here using += -# - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) - -$(PROJECT_INCLUDE)/rtems/score: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/rtems/score/%.h: %.h - $(INSTALL_DATA) $< $@ - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.am b/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.am deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.am b/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.am deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/c/src/exec/score/cpu/i960/rtems/Makefile.am b/c/src/exec/score/cpu/i960/rtems/Makefile.am deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/c/src/exec/score/cpu/i960/rtems/score/Makefile.am b/c/src/exec/score/cpu/i960/rtems/score/Makefile.am deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/c/src/exec/score/cpu/m68k/rtems/Makefile.am b/c/src/exec/score/cpu/m68k/rtems/Makefile.am deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/c/src/exec/score/cpu/m68k/rtems/score/Makefile.am b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.am deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/c/src/exec/score/cpu/mips64orion/rtems/Makefile.am b/c/src/exec/score/cpu/mips64orion/rtems/Makefile.am deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.am b/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.am deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/c/src/exec/score/cpu/no_cpu/rtems/Makefile.am b/c/src/exec/score/cpu/no_cpu/rtems/Makefile.am deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.am b/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.am deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/cpukit/score/cpu/a29k/ChangeLog b/cpukit/score/cpu/a29k/ChangeLog index 85680e5af8..a355f0ac53 100644 --- a/cpukit/score/cpu/a29k/ChangeLog +++ b/cpukit/score/cpu/a29k/ChangeLog @@ -1,3 +1,10 @@ +2002-01-29 Ralf Corsepius + + * rtems/Makefile.am: Removed. + * rtems/score/Makefile.am: Removed. + * configure.ac: Reflect changes above. + * Makefile.am: Reflect changes above. + 2001-12-19 Ralf Corsepius * Makefile.am: Add multilib support. diff --git a/cpukit/score/cpu/a29k/Makefile.am b/cpukit/score/cpu/a29k/Makefile.am index b261f7ab6f..a6646c0d25 100644 --- a/cpukit/score/cpu/a29k/Makefile.am +++ b/cpukit/score/cpu/a29k/Makefile.am @@ -2,35 +2,46 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -include_HEADERS = amd.ah asm.h pswmacro.ah register.ah - -S_FILES = cpu_asm.S sig.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) - include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems: + $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.ah: %.ah - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +include_HEADERS = amd.ah asm.h pswmacro.ah register.ah +PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = \ + rtems/score/a29k.h \ + rtems/score/a29ktypes.h \ + rtems/score/cpu.h \ + rtems/score/cpu_asm.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ +C_FILES = cpu.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +S_FILES = cpu_asm.S sig.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + REL = $(ARCH)/rtems-cpu.rel rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) @@ -38,8 +49,6 @@ rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ @@ -49,5 +58,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = cpu.c cpu_asm.S rtems.c sig.S -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/cpukit/score/cpu/a29k/configure.ac b/cpukit/score/cpu/a29k/configure.ac index af3174a5df..32de91d930 100644 --- a/cpukit/score/cpu/a29k/configure.ac +++ b/cpukit/score/cpu/a29k/configure.ac @@ -26,7 +26,5 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_NEWLIB # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -rtems/Makefile -rtems/score/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog index b2a6cbe020..ba2e9758c8 100644 --- a/cpukit/score/cpu/arm/ChangeLog +++ b/cpukit/score/cpu/arm/ChangeLog @@ -1,3 +1,10 @@ +2002-01-29 Ralf Corsepius + + * rtems/Makefile.am: Removed. + * rtems/score/Makefile.am: Removed. + * configure.ac: Reflect changes above. + * Makefile.am: Reflect changes above. + 2002-02-05 Ralf Corsepius * configure.ac: Remove RTEMS_CHECK_CUSTOM_BSP. diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am index 793fcebfea..90f4bff821 100644 --- a/cpukit/score/cpu/arm/Makefile.am +++ b/cpukit/score/cpu/arm/Makefile.am @@ -2,41 +2,52 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) - -include_HEADERS = asm.h - -REL = $(ARCH)/rtems-cpu.rel - -rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) - include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +include_HEADERS = asm.h +PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = \ + rtems/score/cpu.h \ + rtems/score/arm.h \ + rtems/score/armtypes.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ +C_FILES = cpu.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + +REL = $(ARCH)/rtems-cpu.rel + +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) + $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ @@ -46,5 +57,4 @@ all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = cpu.c cpu_asm.S -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/cpukit/score/cpu/c4x/ChangeLog b/cpukit/score/cpu/c4x/ChangeLog index 91b0ed71a9..b0b7ea7ae2 100644 --- a/cpukit/score/cpu/c4x/ChangeLog +++ b/cpukit/score/cpu/c4x/ChangeLog @@ -1,3 +1,10 @@ +2002-01-29 Ralf Corsepius + + * rtems/Makefile.am: Removed. + * rtems/score/Makefile.am: Removed. + * configure.ac: Reflect changes above. + * Makefile.am: Reflect changes above. + 2002-02-09 Ralf Corsepius * asm.h: Remove #include . diff --git a/cpukit/score/cpu/c4x/Makefile.am b/cpukit/score/cpu/c4x/Makefile.am index 42fbae6fd9..570cca9316 100644 --- a/cpukit/score/cpu/c4x/Makefile.am +++ b/cpukit/score/cpu/c4x/Makefile.am @@ -2,41 +2,53 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -C_FILES = cpu.c irq.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -include_HEADERS = asm.h c4xio.h - -S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) - -REL = $(ARCH)/rtems-cpu.rel - include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am -rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +include_HEADERS = asm.h c4xio.h +PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = \ + rtems/score/cpu.h \ + rtems/score/c4x.h \ + rtems/score/c4xtypes.h \ + rtems/score/cpu_asm.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ +C_FILES = cpu.c irq.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + +REL = $(ARCH)/rtems-cpu.rel + +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) + $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ @@ -46,5 +58,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = cpu.c irq.c cpu_asm.S rtems.c -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/cpukit/score/cpu/c4x/configure.ac b/cpukit/score/cpu/c4x/configure.ac index 78d654425a..8fcf090eab 100644 --- a/cpukit/score/cpu/c4x/configure.ac +++ b/cpukit/score/cpu/c4x/configure.ac @@ -26,7 +26,5 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_NEWLIB # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -rtems/Makefile -rtems/score/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/cpukit/score/cpu/h8300/ChangeLog b/cpukit/score/cpu/h8300/ChangeLog index 00f6aa79c7..1d7544936d 100644 --- a/cpukit/score/cpu/h8300/ChangeLog +++ b/cpukit/score/cpu/h8300/ChangeLog @@ -1,3 +1,10 @@ +2002-01-29 Ralf Corsepius + + * rtems/Makefile.am: Removed. + * rtems/score/Makefile.am: Removed. + * configure.ac: Reflect changes above. + * Makefile.am: Reflect changes above. + 2002-01-07 Ralf Corsepius * rtems/score/cpu.h: #include . diff --git a/cpukit/score/cpu/h8300/Makefile.am b/cpukit/score/cpu/h8300/Makefile.am index 2872868ec7..0f2140197a 100644 --- a/cpukit/score/cpu/h8300/Makefile.am +++ b/cpukit/score/cpu/h8300/Makefile.am @@ -2,41 +2,52 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -C_FILES = cpu.c rtems.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -include_HEADERS = asm.h - -S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) - -REL = $(ARCH)/rtems-cpu.rel - include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am -rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +include_HEADERS = asm.h +PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = \ + rtems/score/cpu.h \ + rtems/score/h8300.h \ + rtems/score/h8300types.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ +C_FILES = cpu.c rtems.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + +REL = $(ARCH)/rtems-cpu.rel + +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) + $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ @@ -46,5 +57,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = cpu.c cpu_asm.S rtems.c -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/cpukit/score/cpu/h8300/configure.ac b/cpukit/score/cpu/h8300/configure.ac index 883a43a96a..b7dd21c883 100644 --- a/cpukit/score/cpu/h8300/configure.ac +++ b/cpukit/score/cpu/h8300/configure.ac @@ -26,7 +26,5 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_NEWLIB # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -rtems/Makefile -rtems/score/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/cpukit/score/cpu/mips64orion/ChangeLog b/cpukit/score/cpu/mips64orion/ChangeLog index 228b9fdf4a..000266af1c 100644 --- a/cpukit/score/cpu/mips64orion/ChangeLog +++ b/cpukit/score/cpu/mips64orion/ChangeLog @@ -1,3 +1,10 @@ +2002-01-29 Ralf Corsepius + + * rtems/Makefile.am: Removed. + * rtems/score/Makefile.am: Removed. + * configure.ac: Reflect changes above. + * Makefile.am: Reflect changes above. + 2001-12-19 Ralf Corsepius * Makefile.am: Add multilib support. diff --git a/cpukit/score/cpu/mips64orion/Makefile.am b/cpukit/score/cpu/mips64orion/Makefile.am index 0b009ba22c..2c15400bf3 100644 --- a/cpukit/score/cpu/mips64orion/Makefile.am +++ b/cpukit/score/cpu/mips64orion/Makefile.am @@ -2,32 +2,45 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -include_HEADERS = asm.h cpu_asm.h idtcpu.h idtmon.h iregdef.h - -S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) - include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +include_HEADERS = asm.h cpu_asm.h idtcpu.h idtmon.h iregdef.h +PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = \ + rtems/score/cpu.h \ + rtems/score/mips64orion.h \ + rtems/score/mipstypes.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ +C_FILES = cpu.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + REL = $(ARCH)/rtems-cpu.rel rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) @@ -35,8 +48,6 @@ rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ @@ -46,5 +57,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = cpu.c cpu_asm.S rtems.c -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/cpukit/score/cpu/mips64orion/configure.ac b/cpukit/score/cpu/mips64orion/configure.ac index 2eadc7090e..a59ffd2e61 100644 --- a/cpukit/score/cpu/mips64orion/configure.ac +++ b/cpukit/score/cpu/mips64orion/configure.ac @@ -26,7 +26,5 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_NEWLIB # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -rtems/Makefile -rtems/score/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT -- cgit v1.2.3