From 8b25dc6bd0704444dd20d1cdc407563b5021233a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 30 Jan 2002 17:45:23 +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/hppa1.1/ChangeLog | 7 ++++ c/src/exec/score/cpu/hppa1.1/Makefile.am | 46 ++++++++++++++++++---- c/src/exec/score/cpu/hppa1.1/configure.ac | 4 +- c/src/exec/score/cpu/hppa1.1/rtems/Makefile.am | 10 ----- .../exec/score/cpu/hppa1.1/rtems/score/Makefile.am | 37 ----------------- c/src/exec/score/cpu/i960/ChangeLog | 7 ++++ c/src/exec/score/cpu/i960/Makefile.am | 42 ++++++++++++-------- c/src/exec/score/cpu/i960/configure.ac | 4 +- c/src/exec/score/cpu/i960/rtems/Makefile.am | 10 ----- c/src/exec/score/cpu/i960/rtems/score/Makefile.am | 25 ------------ c/src/exec/score/cpu/m68k/ChangeLog | 7 ++++ c/src/exec/score/cpu/m68k/Makefile.am | 40 ++++++++++++------- c/src/exec/score/cpu/m68k/configure.ac | 4 +- c/src/exec/score/cpu/m68k/rtems/Makefile.am | 10 ----- c/src/exec/score/cpu/m68k/rtems/score/Makefile.am | 25 ------------ c/src/exec/score/cpu/mips64orion/ChangeLog | 7 ++++ c/src/exec/score/cpu/mips64orion/Makefile.am | 42 ++++++++++++-------- c/src/exec/score/cpu/mips64orion/configure.ac | 4 +- c/src/exec/score/cpu/mips64orion/rtems/Makefile.am | 10 ----- .../score/cpu/mips64orion/rtems/score/Makefile.am | 25 ------------ c/src/exec/score/cpu/no_cpu/ChangeLog | 7 ++++ c/src/exec/score/cpu/no_cpu/Makefile.am | 45 +++++++++++++-------- c/src/exec/score/cpu/no_cpu/configure.ac | 4 +- c/src/exec/score/cpu/no_cpu/rtems/Makefile.am | 10 ----- .../exec/score/cpu/no_cpu/rtems/score/Makefile.am | 25 ------------ cpukit/score/cpu/hppa1.1/ChangeLog | 7 ++++ cpukit/score/cpu/hppa1.1/Makefile.am | 46 ++++++++++++++++++---- cpukit/score/cpu/hppa1.1/configure.ac | 4 +- cpukit/score/cpu/i960/ChangeLog | 7 ++++ cpukit/score/cpu/i960/Makefile.am | 42 ++++++++++++-------- cpukit/score/cpu/i960/configure.ac | 4 +- cpukit/score/cpu/m68k/ChangeLog | 7 ++++ cpukit/score/cpu/m68k/Makefile.am | 40 ++++++++++++------- cpukit/score/cpu/m68k/configure.ac | 4 +- cpukit/score/cpu/no_cpu/ChangeLog | 7 ++++ cpukit/score/cpu/no_cpu/Makefile.am | 45 +++++++++++++-------- cpukit/score/cpu/no_cpu/configure.ac | 4 +- 37 files changed, 334 insertions(+), 340 deletions(-) diff --git a/c/src/exec/score/cpu/hppa1.1/ChangeLog b/c/src/exec/score/cpu/hppa1.1/ChangeLog index 1424e50876..8f9f13bf49 100644 --- a/c/src/exec/score/cpu/hppa1.1/ChangeLog +++ b/c/src/exec/score/cpu/hppa1.1/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/hppa1.1/Makefile.am b/c/src/exec/score/cpu/hppa1.1/Makefile.am index 85f3c7a67c..6a08f979ff 100644 --- a/c/src/exec/score/cpu/hppa1.1/Makefile.am +++ b/c/src/exec/score/cpu/hppa1.1/Makefile.am @@ -2,10 +2,37 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems +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)/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/cpu_asm.h \ + rtems/score/hppa.h \ + rtems/score/hppatypes.h \ + rtems/score/offsets.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) @@ -13,10 +40,6 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) 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 - REL = $(ARCH)/rtems-cpu.rel rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) @@ -33,5 +56,14 @@ all-local: $(ARCH) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = cpu.c cpu_asm.S rtems.S -include $(top_srcdir)/../../../../../../automake/subdirs.am +# FIXME: We should get rid of genoffsets +GENOFFSETS = $(PROJECT_TOPdir)/tools/cpu/hppa1.1/genoffsets + +GENERIC_H_FILES = rtems/score/offsets.h +rtems/score/offsets.h: $(GENOFFSETS) cpu.h + @(mkinstalldirs) rtems/score + $(RM) $@ + $(GENOFFSETS) > $@ +CLEANFILES = rtems/score/offsets.h + include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/hppa1.1/configure.ac b/c/src/exec/score/cpu/hppa1.1/configure.ac index 45f67ae807..e8fb31eaa3 100644 --- a/c/src/exec/score/cpu/hppa1.1/configure.ac +++ b/c/src/exec/score/cpu/hppa1.1/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/hppa1.1/rtems/Makefile.am b/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.am index ef7df82af7..e69de29bb2 100644 --- a/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.am +++ b/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.am @@ -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/hppa1.1/rtems/score/Makefile.am b/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.am index 93f481ec79..e69de29bb2 100644 --- a/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.am @@ -1,37 +0,0 @@ -## -## $Id$ -## -## FIXME: Handling of offsets.h needs to be reworked. -## -AUTOMAKE_OPTIONS = foreign 1.4 - -include_rtems_scoredir = $(includedir)/rtems/score - -GENOFFSETS = $(PROJECT_TOPdir)/tools/cpu/hppa1.1/genoffsets - -GENERIC_H_FILES = offsets.h -include_rtems_score_HEADERS = cpu.h cpu_asm.h hppa.h hppatypes.h - -# -# (OPTIONAL) Add local stuff here using += -# - -offsets.h: $(GENOFFSETS) cpu.h - $(RM) $@ - $(GENOFFSETS) > $@ - -CLEANFILES = offsets.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) \ - $(GENERIC_H_FILES:%.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/i960/ChangeLog b/c/src/exec/score/cpu/i960/ChangeLog index 724271f28f..1b74aabffc 100644 --- a/c/src/exec/score/cpu/i960/ChangeLog +++ b/c/src/exec/score/cpu/i960/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/i960/Makefile.am b/c/src/exec/score/cpu/i960/Makefile.am index 1ee5603e2c..ce9e6bf528 100644 --- a/c/src/exec/score/cpu/i960/Makefile.am +++ b/c/src/exec/score/cpu/i960/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 - -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 +PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = \ + rtems/score/cpu.h \ + rtems/score/i960.h \ + rtems/score/i960types.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 i960RP.h rtems.S -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/i960/configure.ac b/c/src/exec/score/cpu/i960/configure.ac index bd6b30e516..755ca6e118 100644 --- a/c/src/exec/score/cpu/i960/configure.ac +++ b/c/src/exec/score/cpu/i960/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/i960/rtems/Makefile.am b/c/src/exec/score/cpu/i960/rtems/Makefile.am index ef7df82af7..e69de29bb2 100644 --- a/c/src/exec/score/cpu/i960/rtems/Makefile.am +++ b/c/src/exec/score/cpu/i960/rtems/Makefile.am @@ -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/i960/rtems/score/Makefile.am b/c/src/exec/score/cpu/i960/rtems/score/Makefile.am index b7066749e4..e69de29bb2 100644 --- a/c/src/exec/score/cpu/i960/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/i960/rtems/score/Makefile.am @@ -1,25 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = cpu.h i960.h i960types.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/m68k/ChangeLog b/c/src/exec/score/cpu/m68k/ChangeLog index 7edeb87113..8e6af4fe6f 100644 --- a/c/src/exec/score/cpu/m68k/ChangeLog +++ b/c/src/exec/score/cpu/m68k/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/m68k/Makefile.am b/c/src/exec/score/cpu/m68k/Makefile.am index f9cda701b4..64ccd43910 100644 --- a/c/src/exec/score/cpu/m68k/Makefile.am +++ b/c/src/exec/score/cpu/m68k/Makefile.am @@ -5,29 +5,42 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -C_FILES = cpu.c memcpy.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -include_HEADERS = asm.h m68302.h m68360.h qsm.h sim.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 m68302.h m68360.h qsm.h sim.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/m68k.h \ + rtems/score/m68ktypes.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 memcpy.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 memcpy.c rtems.S -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/m68k/configure.ac b/c/src/exec/score/cpu/m68k/configure.ac index 599fac5de6..4e922e9f52 100644 --- a/c/src/exec/score/cpu/m68k/configure.ac +++ b/c/src/exec/score/cpu/m68k/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/m68k/rtems/Makefile.am b/c/src/exec/score/cpu/m68k/rtems/Makefile.am index ef7df82af7..e69de29bb2 100644 --- a/c/src/exec/score/cpu/m68k/rtems/Makefile.am +++ b/c/src/exec/score/cpu/m68k/rtems/Makefile.am @@ -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/m68k/rtems/score/Makefile.am b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.am index 73603e6914..e69de29bb2 100644 --- a/c/src/exec/score/cpu/m68k/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.am @@ -1,25 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = cpu.h m68k.h m68ktypes.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/mips64orion/ChangeLog b/c/src/exec/score/cpu/mips64orion/ChangeLog index 228b9fdf4a..000266af1c 100644 --- a/c/src/exec/score/cpu/mips64orion/ChangeLog +++ b/c/src/exec/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/c/src/exec/score/cpu/mips64orion/Makefile.am b/c/src/exec/score/cpu/mips64orion/Makefile.am index 0b009ba22c..2c15400bf3 100644 --- a/c/src/exec/score/cpu/mips64orion/Makefile.am +++ b/c/src/exec/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/c/src/exec/score/cpu/mips64orion/configure.ac b/c/src/exec/score/cpu/mips64orion/configure.ac index 2eadc7090e..a59ffd2e61 100644 --- a/c/src/exec/score/cpu/mips64orion/configure.ac +++ b/c/src/exec/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 diff --git a/c/src/exec/score/cpu/mips64orion/rtems/Makefile.am b/c/src/exec/score/cpu/mips64orion/rtems/Makefile.am index ef7df82af7..e69de29bb2 100644 --- a/c/src/exec/score/cpu/mips64orion/rtems/Makefile.am +++ b/c/src/exec/score/cpu/mips64orion/rtems/Makefile.am @@ -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/mips64orion/rtems/score/Makefile.am b/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.am index b9371f8ef2..e69de29bb2 100644 --- a/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.am @@ -1,25 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = cpu.h mips64orion.h mipstypes.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/no_cpu/ChangeLog b/c/src/exec/score/cpu/no_cpu/ChangeLog index 77fabf093c..7bf65acea4 100644 --- a/c/src/exec/score/cpu/no_cpu/ChangeLog +++ b/c/src/exec/score/cpu/no_cpu/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/no_cpu/Makefile.am b/c/src/exec/score/cpu/no_cpu/Makefile.am index 7c1cecb6e5..269fa1344e 100644 --- a/c/src/exec/score/cpu/no_cpu/Makefile.am +++ b/c/src/exec/score/cpu/no_cpu/Makefile.am @@ -2,38 +2,50 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -C_FILES = cpu.c cpu_asm.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -include_HEADERS = asm.h - -REL = $(ARCH)/rtems-cpu.rel - -rtems_cpu_rel_OBJECTS = $(C_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/no_cpu.h \ + rtems/score/cpu_asm.h \ + no_cputypes.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 cpu_asm.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +REL = $(ARCH)/rtems-cpu.rel + +rtems_cpu_rel_OBJECTS = $(C_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) \ @@ -43,5 +55,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = 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/no_cpu/configure.ac b/c/src/exec/score/cpu/no_cpu/configure.ac index 049222d9ef..edb0a2aee7 100644 --- a/c/src/exec/score/cpu/no_cpu/configure.ac +++ b/c/src/exec/score/cpu/no_cpu/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/no_cpu/rtems/Makefile.am b/c/src/exec/score/cpu/no_cpu/rtems/Makefile.am index ef7df82af7..e69de29bb2 100644 --- a/c/src/exec/score/cpu/no_cpu/rtems/Makefile.am +++ b/c/src/exec/score/cpu/no_cpu/rtems/Makefile.am @@ -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/no_cpu/rtems/score/Makefile.am b/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.am index 13bb405434..e69de29bb2 100644 --- a/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.am @@ -1,25 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = cpu.h no_cpu.h cpu_asm.h no_cputypes.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/cpukit/score/cpu/hppa1.1/ChangeLog b/cpukit/score/cpu/hppa1.1/ChangeLog index 1424e50876..8f9f13bf49 100644 --- a/cpukit/score/cpu/hppa1.1/ChangeLog +++ b/cpukit/score/cpu/hppa1.1/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/hppa1.1/Makefile.am b/cpukit/score/cpu/hppa1.1/Makefile.am index 85f3c7a67c..6a08f979ff 100644 --- a/cpukit/score/cpu/hppa1.1/Makefile.am +++ b/cpukit/score/cpu/hppa1.1/Makefile.am @@ -2,10 +2,37 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems +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)/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/cpu_asm.h \ + rtems/score/hppa.h \ + rtems/score/hppatypes.h \ + rtems/score/offsets.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) @@ -13,10 +40,6 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) 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 - REL = $(ARCH)/rtems-cpu.rel rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) @@ -33,5 +56,14 @@ all-local: $(ARCH) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = cpu.c cpu_asm.S rtems.S -include $(top_srcdir)/../../../../../../automake/subdirs.am +# FIXME: We should get rid of genoffsets +GENOFFSETS = $(PROJECT_TOPdir)/tools/cpu/hppa1.1/genoffsets + +GENERIC_H_FILES = rtems/score/offsets.h +rtems/score/offsets.h: $(GENOFFSETS) cpu.h + @(mkinstalldirs) rtems/score + $(RM) $@ + $(GENOFFSETS) > $@ +CLEANFILES = rtems/score/offsets.h + include $(top_srcdir)/../../../../../../automake/local.am diff --git a/cpukit/score/cpu/hppa1.1/configure.ac b/cpukit/score/cpu/hppa1.1/configure.ac index 45f67ae807..e8fb31eaa3 100644 --- a/cpukit/score/cpu/hppa1.1/configure.ac +++ b/cpukit/score/cpu/hppa1.1/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/i960/ChangeLog b/cpukit/score/cpu/i960/ChangeLog index 724271f28f..1b74aabffc 100644 --- a/cpukit/score/cpu/i960/ChangeLog +++ b/cpukit/score/cpu/i960/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/i960/Makefile.am b/cpukit/score/cpu/i960/Makefile.am index 1ee5603e2c..ce9e6bf528 100644 --- a/cpukit/score/cpu/i960/Makefile.am +++ b/cpukit/score/cpu/i960/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 - -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 +PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = \ + rtems/score/cpu.h \ + rtems/score/i960.h \ + rtems/score/i960types.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 i960RP.h rtems.S -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/cpukit/score/cpu/i960/configure.ac b/cpukit/score/cpu/i960/configure.ac index bd6b30e516..755ca6e118 100644 --- a/cpukit/score/cpu/i960/configure.ac +++ b/cpukit/score/cpu/i960/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/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog index 7edeb87113..8e6af4fe6f 100644 --- a/cpukit/score/cpu/m68k/ChangeLog +++ b/cpukit/score/cpu/m68k/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/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am index f9cda701b4..64ccd43910 100644 --- a/cpukit/score/cpu/m68k/Makefile.am +++ b/cpukit/score/cpu/m68k/Makefile.am @@ -5,29 +5,42 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -C_FILES = cpu.c memcpy.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -include_HEADERS = asm.h m68302.h m68360.h qsm.h sim.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 m68302.h m68360.h qsm.h sim.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/m68k.h \ + rtems/score/m68ktypes.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 memcpy.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 memcpy.c rtems.S -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/cpukit/score/cpu/m68k/configure.ac b/cpukit/score/cpu/m68k/configure.ac index 599fac5de6..4e922e9f52 100644 --- a/cpukit/score/cpu/m68k/configure.ac +++ b/cpukit/score/cpu/m68k/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/no_cpu/ChangeLog b/cpukit/score/cpu/no_cpu/ChangeLog index 77fabf093c..7bf65acea4 100644 --- a/cpukit/score/cpu/no_cpu/ChangeLog +++ b/cpukit/score/cpu/no_cpu/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/no_cpu/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am index 7c1cecb6e5..269fa1344e 100644 --- a/cpukit/score/cpu/no_cpu/Makefile.am +++ b/cpukit/score/cpu/no_cpu/Makefile.am @@ -2,38 +2,50 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -C_FILES = cpu.c cpu_asm.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -include_HEADERS = asm.h - -REL = $(ARCH)/rtems-cpu.rel - -rtems_cpu_rel_OBJECTS = $(C_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/no_cpu.h \ + rtems/score/cpu_asm.h \ + no_cputypes.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 cpu_asm.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +REL = $(ARCH)/rtems-cpu.rel + +rtems_cpu_rel_OBJECTS = $(C_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) \ @@ -43,5 +55,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = cpu.c cpu_asm.c rtems.c -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/cpukit/score/cpu/no_cpu/configure.ac b/cpukit/score/cpu/no_cpu/configure.ac index 049222d9ef..edb0a2aee7 100644 --- a/cpukit/score/cpu/no_cpu/configure.ac +++ b/cpukit/score/cpu/no_cpu/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