From 329509fbdd9999e9bb3b3f5cd0a09c11cec12dad Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 5 Feb 2001 18:41:35 +0000 Subject: 2001-02-04 Ralf Corsepius * Makefile.am, rtems/score/Makefile.am: Apply include_*HEADERS instead of H_FILES. --- c/src/exec/score/cpu/a29k/ChangeLog | 5 +++++ c/src/exec/score/cpu/a29k/Makefile.am | 7 +++---- c/src/exec/score/cpu/a29k/rtems/score/Makefile.am | 7 ++++--- c/src/exec/score/cpu/arm/ChangeLog | 5 +++++ c/src/exec/score/cpu/arm/Makefile.am | 6 +++--- c/src/exec/score/cpu/arm/rtems/score/Makefile.am | 6 +++--- c/src/exec/score/cpu/c4x/ChangeLog | 5 +++++ c/src/exec/score/cpu/c4x/Makefile.am | 6 +++--- c/src/exec/score/cpu/c4x/rtems/score/Makefile.am | 6 +++--- c/src/exec/score/cpu/h8300/ChangeLog | 5 +++++ c/src/exec/score/cpu/h8300/Makefile.am | 6 +++--- c/src/exec/score/cpu/h8300/rtems/score/Makefile.am | 6 +++--- c/src/exec/score/cpu/hppa1.1/ChangeLog | 6 ++++++ c/src/exec/score/cpu/hppa1.1/Makefile.am | 13 +------------ c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.am | 12 +++++++----- c/src/exec/score/cpu/i386/ChangeLog | 5 +++++ c/src/exec/score/cpu/i386/Makefile.am | 6 +++--- c/src/exec/score/cpu/i386/rtems/score/Makefile.am | 6 +++--- c/src/exec/score/cpu/i960/ChangeLog | 5 +++++ c/src/exec/score/cpu/i960/Makefile.am | 6 +++--- c/src/exec/score/cpu/i960/rtems/score/Makefile.am | 6 +++--- c/src/exec/score/cpu/m68k/ChangeLog | 5 +++++ c/src/exec/score/cpu/m68k/Makefile.am | 7 +++---- c/src/exec/score/cpu/m68k/rtems/score/Makefile.am | 6 +++--- c/src/exec/score/cpu/mips/ChangeLog | 5 +++++ c/src/exec/score/cpu/mips/Makefile.am | 7 +++---- c/src/exec/score/cpu/mips/rtems/score/Makefile.am | 6 +++--- c/src/exec/score/cpu/mips64orion/ChangeLog | 5 +++++ c/src/exec/score/cpu/mips64orion/Makefile.am | 7 +++---- c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.am | 6 +++--- c/src/exec/score/cpu/no_cpu/ChangeLog | 5 +++++ c/src/exec/score/cpu/no_cpu/Makefile.am | 6 +++--- c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.am | 6 +++--- c/src/exec/score/cpu/or16/ChangeLog | 5 +++++ c/src/exec/score/cpu/or16/Makefile.am | 6 +++--- c/src/exec/score/cpu/or16/rtems/score/Makefile.am | 6 +++--- c/src/exec/score/cpu/or32/ChangeLog | 5 +++++ c/src/exec/score/cpu/or32/Makefile.am | 6 +++--- c/src/exec/score/cpu/or32/rtems/score/Makefile.am | 6 +++--- c/src/exec/score/cpu/powerpc/ChangeLog | 5 +++++ c/src/exec/score/cpu/powerpc/shared/Makefile.am | 11 ++++++----- c/src/exec/score/cpu/sh/ChangeLog | 5 +++++ c/src/exec/score/cpu/sh/Makefile.am | 4 ++-- c/src/exec/score/cpu/sh/rtems/score/Makefile.am | 7 ++++--- c/src/exec/score/cpu/sparc/ChangeLog | 5 +++++ c/src/exec/score/cpu/sparc/Makefile.am | 6 +++--- c/src/exec/score/cpu/sparc/rtems/score/Makefile.am | 7 ++++--- c/src/exec/score/cpu/unix/ChangeLog | 5 +++++ c/src/exec/score/cpu/unix/rtems/score/Makefile.am | 9 +++++---- 49 files changed, 191 insertions(+), 113 deletions(-) (limited to 'c/src/exec/score/cpu') diff --git a/c/src/exec/score/cpu/a29k/ChangeLog b/c/src/exec/score/cpu/a29k/ChangeLog index 2dc77f5ce3..64f0014001 100644 --- a/c/src/exec/score/cpu/a29k/ChangeLog +++ b/c/src/exec/score/cpu/a29k/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-03 Joel Sherrill * rtems/score/cpu.h: Added _CPU_Initialize_vectors(). diff --git a/c/src/exec/score/cpu/a29k/Makefile.am b/c/src/exec/score/cpu/a29k/Makefile.am index bcd1a61b0b..e7d78d5ac6 100644 --- a/c/src/exec/score/cpu/a29k/Makefile.am +++ b/c/src/exec/score/cpu/a29k/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = rtems C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = amd.ah asm.h pswmacro.ah register.ah +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) @@ -38,7 +38,7 @@ rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o @@ -47,8 +47,7 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ .PRECIOUS: $(REL) -EXTRA_DIST = amd.ah asm.h cpu.c cpu_asm.S pswmacro.ah register.ah rtems.c \ - sig.S +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/rtems/score/Makefile.am b/c/src/exec/score/cpu/a29k/rtems/score/Makefile.am index 6f47d2e20b..198bb6ae23 100644 --- a/c/src/exec/score/cpu/a29k/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/a29k/rtems/score/Makefile.am @@ -4,15 +4,16 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = a29k.h a29ktypes.h cpu.h cpu_asm.h -noinst_HEADERS = $(H_FILES) +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 \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/arm/ChangeLog b/c/src/exec/score/cpu/arm/ChangeLog index 278a8029de..4b6c7fe6e1 100644 --- a/c/src/exec/score/cpu/arm/ChangeLog +++ b/c/src/exec/score/cpu/arm/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-03 Joel Sherrill * rtems/score/cpu.h: Added _CPU_Initialize_vectors(). diff --git a/c/src/exec/score/cpu/arm/Makefile.am b/c/src/exec/score/cpu/arm/Makefile.am index d3286f6e72..91d2e5db90 100644 --- a/c/src/exec/score/cpu/arm/Makefile.am +++ b/c/src/exec/score/cpu/arm/Makefile.am @@ -13,7 +13,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) S_FILES = cpu_asm.S S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) -H_FILES = asm.h +include_HEADERS = asm.h REL = $(ARCH)/rtems-cpu.rel @@ -35,7 +35,7 @@ $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o @@ -44,7 +44,7 @@ all: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ .PRECIOUS: $(REL) -EXTRA_DIST = asm.h cpu.c cpu_asm.S +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/score/Makefile.am b/c/src/exec/score/cpu/arm/rtems/score/Makefile.am index c7a70a5897..7d51bca371 100644 --- a/c/src/exec/score/cpu/arm/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/arm/rtems/score/Makefile.am @@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = cpu.h arm.h armtypes.h -noinst_HEADERS = $(H_FILES) +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 \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/c4x/ChangeLog b/c/src/exec/score/cpu/c4x/ChangeLog index 31f30286e5..3a276a1c63 100644 --- a/c/src/exec/score/cpu/c4x/ChangeLog +++ b/c/src/exec/score/cpu/c4x/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-03 Joel Sherrill * rtems/score/cpu.h: Added _CPU_Initialize_vectors(). diff --git a/c/src/exec/score/cpu/c4x/Makefile.am b/c/src/exec/score/cpu/c4x/Makefile.am index c180e26ff8..8fb27b7afc 100644 --- a/c/src/exec/score/cpu/c4x/Makefile.am +++ b/c/src/exec/score/cpu/c4x/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = rtems C_FILES = cpu.c irq.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = asm.h c4xio.h +include_HEADERS = asm.h c4xio.h S_FILES = cpu_asm.S S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) @@ -35,7 +35,7 @@ $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o @@ -44,7 +44,7 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ .PRECIOUS: $(REL) -EXTRA_DIST = asm.h cpu.c irq.c cpu_asm.S c4xio.h rtems.c +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/rtems/score/Makefile.am b/c/src/exec/score/cpu/c4x/rtems/score/Makefile.am index 44f554e30d..165cccc781 100644 --- a/c/src/exec/score/cpu/c4x/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/c4x/rtems/score/Makefile.am @@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = cpu.h c4x.h c4xtypes.h cpu_asm.h -noinst_HEADERS = $(H_FILES) +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 \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/h8300/ChangeLog b/c/src/exec/score/cpu/h8300/ChangeLog index 57e5358c57..692508b6ac 100644 --- a/c/src/exec/score/cpu/h8300/ChangeLog +++ b/c/src/exec/score/cpu/h8300/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-03 Joel Sherrill * rtems/score/cpu.h: Added _CPU_Initialize_vectors(). diff --git a/c/src/exec/score/cpu/h8300/Makefile.am b/c/src/exec/score/cpu/h8300/Makefile.am index c07aecc471..33831e1b03 100644 --- a/c/src/exec/score/cpu/h8300/Makefile.am +++ b/c/src/exec/score/cpu/h8300/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = rtems C_FILES = cpu.c rtems.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = asm.h +include_HEADERS = asm.h S_FILES = cpu_asm.S S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) @@ -35,7 +35,7 @@ $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o @@ -44,7 +44,7 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ .PRECIOUS: $(REL) -EXTRA_DIST = asm.h cpu.c cpu_asm.S rtems.c +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/rtems/score/Makefile.am b/c/src/exec/score/cpu/h8300/rtems/score/Makefile.am index a21ad00f85..1e84fb9160 100644 --- a/c/src/exec/score/cpu/h8300/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/h8300/rtems/score/Makefile.am @@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = cpu.h h8300.h h8300types.h -noinst_HEADERS = $(H_FILES) +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 \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/hppa1.1/ChangeLog b/c/src/exec/score/cpu/hppa1.1/ChangeLog index d746a28b50..6650b9d195 100644 --- a/c/src/exec/score/cpu/hppa1.1/ChangeLog +++ b/c/src/exec/score/cpu/hppa1.1/ChangeLog @@ -1,3 +1,9 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am: Remove references to PROJECT_INCLUDE. + * rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-03 Joel Sherrill * rtems/score/cpu.h: Added _CPU_Initialize_vectors(). diff --git a/c/src/exec/score/cpu/hppa1.1/Makefile.am b/c/src/exec/score/cpu/hppa1.1/Makefile.am index f9c76d73c3..74d356b0b1 100644 --- a/c/src/exec/score/cpu/hppa1.1/Makefile.am +++ b/c/src/exec/score/cpu/hppa1.1/Makefile.am @@ -17,15 +17,6 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o - $(INSTALL_DATA) $< $@ - REL = $(ARCH)/rtems-cpu.rel rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) @@ -33,11 +24,9 @@ rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -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) \ +all-local: $(ARCH) $(rtems_cpu_rel_OBJECTS) $(REL) \ $(TMPINSTALL_FILES) .PRECIOUS: $(REL) 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 46e19b0397..2a6bfd60fe 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,14 +1,16 @@ ## ## $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 -STATIC_H_FILES = cpu.h cpu_asm.h hppa.h hppatypes.h -noinst_HEADERS = $(STATIC_H_FILES) +include_rtems_score_HEADERS = cpu.h cpu_asm.h hppa.h hppatypes.h # # (OPTIONAL) Add local stuff here using += @@ -18,10 +20,10 @@ offsets.h: $(GENOFFSETS) cpu.h $(RM) $@ $(GENOFFSETS) > $@ -CLEANFILES = offsets.h +CLEANFILES += offsets.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ - $(STATIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) \ $(GENERIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: diff --git a/c/src/exec/score/cpu/i386/ChangeLog b/c/src/exec/score/cpu/i386/ChangeLog index 718034a40a..b9e307ce63 100644 --- a/c/src/exec/score/cpu/i386/ChangeLog +++ b/c/src/exec/score/cpu/i386/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-03 Joel Sherrill * rtems/score/cpu.h: Added _CPU_Initialize_vectors(). diff --git a/c/src/exec/score/cpu/i386/Makefile.am b/c/src/exec/score/cpu/i386/Makefile.am index 611ddb6e5e..329fcf25ef 100644 --- a/c/src/exec/score/cpu/i386/Makefile.am +++ b/c/src/exec/score/cpu/i386/Makefile.am @@ -12,7 +12,7 @@ REL = $(ARCH)/rtems-cpu.rel C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = asm.h +include_HEADERS = asm.h S_FILES = cpu_asm.S S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) @@ -35,7 +35,7 @@ $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o @@ -44,7 +44,7 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ .PRECIOUS: $(REL) -EXTRA_DIST = asm.h 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/rtems/score/Makefile.am b/c/src/exec/score/cpu/i386/rtems/score/Makefile.am index 9d7ca37423..9f93029a4f 100644 --- a/c/src/exec/score/cpu/i386/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/i386/rtems/score/Makefile.am @@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = cpu.h i386.h i386types.h -noinst_HEADERS = $(H_FILES) +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = cpu.h i386.h i386types.h # # (OPTIONAL) Add local stuff here using += # PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/i960/ChangeLog b/c/src/exec/score/cpu/i960/ChangeLog index e5f7b0d466..73516788a7 100644 --- a/c/src/exec/score/cpu/i960/ChangeLog +++ b/c/src/exec/score/cpu/i960/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-03 Joel Sherrill * rtems/score/cpu.h: Added _CPU_Initialize_vectors(). diff --git a/c/src/exec/score/cpu/i960/Makefile.am b/c/src/exec/score/cpu/i960/Makefile.am index 336b836872..f85aee2d93 100644 --- a/c/src/exec/score/cpu/i960/Makefile.am +++ b/c/src/exec/score/cpu/i960/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = rtems C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = asm.h +include_HEADERS = asm.h S_FILES = cpu_asm.S S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) @@ -35,7 +35,7 @@ rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o @@ -44,7 +44,7 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ .PRECIOUS: $(REL) -EXTRA_DIST = asm.h cpu.c cpu_asm.S i960RP.h rtems.S +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/rtems/score/Makefile.am b/c/src/exec/score/cpu/i960/rtems/score/Makefile.am index c7c8212303..8199f7e4cc 100644 --- a/c/src/exec/score/cpu/i960/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/i960/rtems/score/Makefile.am @@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = cpu.h i960.h i960types.h -noinst_HEADERS = $(H_FILES) +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 \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/m68k/ChangeLog b/c/src/exec/score/cpu/m68k/ChangeLog index 13ec23bbf5..3071ea8aa1 100644 --- a/c/src/exec/score/cpu/m68k/ChangeLog +++ b/c/src/exec/score/cpu/m68k/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-03 Joel Sherrill * rtems/score/cpu.h: Added _CPU_Initialize_vectors(). diff --git a/c/src/exec/score/cpu/m68k/Makefile.am b/c/src/exec/score/cpu/m68k/Makefile.am index 00a804ca83..125a0217d1 100644 --- a/c/src/exec/score/cpu/m68k/Makefile.am +++ b/c/src/exec/score/cpu/m68k/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = rtems C_FILES = cpu.c memcpy.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = asm.h m68302.h m68360.h qsm.h sim.h +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) @@ -35,7 +35,7 @@ rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o @@ -44,8 +44,7 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ .PRECIOUS: $(REL) -EXTRA_DIST = asm.h cpu.c cpu_asm.S m68302.h m68360.h memcpy.c qsm.h rtems.S \ - sim.h +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/rtems/score/Makefile.am b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.am index fa38bea692..c9a0772392 100644 --- a/c/src/exec/score/cpu/m68k/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.am @@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = cpu.h m68k.h m68ktypes.h -noinst_HEADERS = $(H_FILES) +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 \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/mips/ChangeLog b/c/src/exec/score/cpu/mips/ChangeLog index c90be4053a..04b63c7c3e 100644 --- a/c/src/exec/score/cpu/mips/ChangeLog +++ b/c/src/exec/score/cpu/mips/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-12 Joel Sherrill * rtems/score/mips.h (mips_get_sr, mips_set_sr): Corrected diff --git a/c/src/exec/score/cpu/mips/Makefile.am b/c/src/exec/score/cpu/mips/Makefile.am index 0d2689b65d..d794212af6 100644 --- a/c/src/exec/score/cpu/mips/Makefile.am +++ b/c/src/exec/score/cpu/mips/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = rtems C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = asm.h idtcpu.h iregdef.h +include_HEADERS = asm.h idtcpu.h iregdef.h S_FILES = cpu_asm.S S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) @@ -35,7 +35,7 @@ rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o @@ -44,8 +44,7 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ .PRECIOUS: $(REL) -EXTRA_DIST = asm.h cpu.c cpu_asm.S idtcpu.h iregdef.h \ - rtems.c +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/mips/rtems/score/Makefile.am b/c/src/exec/score/cpu/mips/rtems/score/Makefile.am index 097a177601..0831821782 100644 --- a/c/src/exec/score/cpu/mips/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/mips/rtems/score/Makefile.am @@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = cpu.h mips.h mipstypes.h -noinst_HEADERS = $(H_FILES) +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = cpu.h mips.h mipstypes.h # # (OPTIONAL) Add local stuff here using += # PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/mips64orion/ChangeLog b/c/src/exec/score/cpu/mips64orion/ChangeLog index 2b5c3bfdca..e03228a59c 100644 --- a/c/src/exec/score/cpu/mips64orion/ChangeLog +++ b/c/src/exec/score/cpu/mips64orion/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-03 Joel Sherrill * rtems/score/cpu.h: Added _CPU_Initialize_vectors(). diff --git a/c/src/exec/score/cpu/mips64orion/Makefile.am b/c/src/exec/score/cpu/mips64orion/Makefile.am index 4f515d2147..5ed80f86ce 100644 --- a/c/src/exec/score/cpu/mips64orion/Makefile.am +++ b/c/src/exec/score/cpu/mips64orion/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = rtems C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = asm.h cpu_asm.h idtcpu.h idtmon.h iregdef.h +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) @@ -35,7 +35,7 @@ rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o @@ -44,8 +44,7 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ .PRECIOUS: $(REL) -EXTRA_DIST = asm.h cpu.c cpu_asm.S cpu_asm.h idtcpu.h idtmon.h iregdef.h \ - rtems.c +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/rtems/score/Makefile.am b/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.am index be1e4fd6b7..c871f36710 100644 --- a/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.am @@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = cpu.h mips64orion.h mipstypes.h -noinst_HEADERS = $(H_FILES) +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 \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/no_cpu/ChangeLog b/c/src/exec/score/cpu/no_cpu/ChangeLog index a4ea6a95e3..3f57f67e7d 100644 --- a/c/src/exec/score/cpu/no_cpu/ChangeLog +++ b/c/src/exec/score/cpu/no_cpu/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-03 Joel Sherrill * rtems/score/cpu.h: Added _CPU_Initialize_vectors(). diff --git a/c/src/exec/score/cpu/no_cpu/Makefile.am b/c/src/exec/score/cpu/no_cpu/Makefile.am index a322f6920f..07bebb15d9 100644 --- a/c/src/exec/score/cpu/no_cpu/Makefile.am +++ b/c/src/exec/score/cpu/no_cpu/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = rtems C_FILES = cpu.c cpu_asm.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = asm.h +include_HEADERS = asm.h REL = $(ARCH)/rtems-cpu.rel @@ -32,7 +32,7 @@ $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o @@ -41,7 +41,7 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ .PRECIOUS: $(REL) -EXTRA_DIST = asm.h cpu.c cpu_asm.c rtems.c +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/rtems/score/Makefile.am b/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.am index 972d50d860..9a4e84f9b7 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 @@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = cpu.h no_cpu.h cpu_asm.h no_cputypes.h -noinst_HEADERS = $(H_FILES) +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 \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/or16/ChangeLog b/c/src/exec/score/cpu/or16/ChangeLog index 6d237e9c24..ddd36b3f39 100644 --- a/c/src/exec/score/cpu/or16/ChangeLog +++ b/c/src/exec/score/cpu/or16/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-03 Joel Sherrill * rtems/score/cpu.h: Added _CPU_Initialize_vectors(). diff --git a/c/src/exec/score/cpu/or16/Makefile.am b/c/src/exec/score/cpu/or16/Makefile.am index a322f6920f..07bebb15d9 100644 --- a/c/src/exec/score/cpu/or16/Makefile.am +++ b/c/src/exec/score/cpu/or16/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = rtems C_FILES = cpu.c cpu_asm.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = asm.h +include_HEADERS = asm.h REL = $(ARCH)/rtems-cpu.rel @@ -32,7 +32,7 @@ $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o @@ -41,7 +41,7 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ .PRECIOUS: $(REL) -EXTRA_DIST = asm.h cpu.c cpu_asm.c rtems.c +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/or16/rtems/score/Makefile.am b/c/src/exec/score/cpu/or16/rtems/score/Makefile.am index 0f88d78e7a..3830b7932c 100644 --- a/c/src/exec/score/cpu/or16/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/or16/rtems/score/Makefile.am @@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = cpu.h or16.h cpu_asm.h or16types.h -noinst_HEADERS = $(H_FILES) +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = cpu.h or16.h cpu_asm.h or16types.h # # (OPTIONAL) Add local stuff here using += # PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/or32/ChangeLog b/c/src/exec/score/cpu/or32/ChangeLog index 0cc40b9933..a2df1c1ed1 100644 --- a/c/src/exec/score/cpu/or32/ChangeLog +++ b/c/src/exec/score/cpu/or32/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-03 Joel Sherrill * rtems/score/cpu.h: Added _CPU_Initialize_vectors(). diff --git a/c/src/exec/score/cpu/or32/Makefile.am b/c/src/exec/score/cpu/or32/Makefile.am index a322f6920f..07bebb15d9 100644 --- a/c/src/exec/score/cpu/or32/Makefile.am +++ b/c/src/exec/score/cpu/or32/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = rtems C_FILES = cpu.c cpu_asm.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = asm.h +include_HEADERS = asm.h REL = $(ARCH)/rtems-cpu.rel @@ -32,7 +32,7 @@ $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o @@ -41,7 +41,7 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ .PRECIOUS: $(REL) -EXTRA_DIST = asm.h cpu.c cpu_asm.c rtems.c +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/or32/rtems/score/Makefile.am b/c/src/exec/score/cpu/or32/rtems/score/Makefile.am index 06c68ef018..02b78c8696 100644 --- a/c/src/exec/score/cpu/or32/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/or32/rtems/score/Makefile.am @@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = cpu.h or32.h cpu_asm.h or32types.h -noinst_HEADERS = $(H_FILES) +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = cpu.h or32.h cpu_asm.h or32types.h # # (OPTIONAL) Add local stuff here using += # PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/powerpc/ChangeLog b/c/src/exec/score/cpu/powerpc/ChangeLog index 34349c5d49..41eec29190 100644 --- a/c/src/exec/score/cpu/powerpc/ChangeLog +++ b/c/src/exec/score/cpu/powerpc/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2000-11-09 Ralf Corsepius * Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS. diff --git a/c/src/exec/score/cpu/powerpc/shared/Makefile.am b/c/src/exec/score/cpu/powerpc/shared/Makefile.am index 7aae87d8d3..0b9f5963a4 100644 --- a/c/src/exec/score/cpu/powerpc/shared/Makefile.am +++ b/c/src/exec/score/cpu/powerpc/shared/Makefile.am @@ -4,17 +4,18 @@ AUTOMAKE_OPTIONS = foreign 1.4 -ROOT_H_FILES = asm.h -RTEMS_SCORE_H_FILES = ppc.h ppctypes.h -noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES) +include_rtems_scoredir = $(includedir)/rtems/score + +include_HEADERS = asm.h +include_rtems_score_HEADERS = ppc.h ppctypes.h # # (OPTIONAL) Add local stuff here using += # PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \ - $(ROOT_H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \ - $(RTEMS_SCORE_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(include_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE): $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/sh/ChangeLog b/c/src/exec/score/cpu/sh/ChangeLog index 2b5c3bfdca..e03228a59c 100644 --- a/c/src/exec/score/cpu/sh/ChangeLog +++ b/c/src/exec/score/cpu/sh/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-03 Joel Sherrill * rtems/score/cpu.h: Added _CPU_Initialize_vectors(). diff --git a/c/src/exec/score/cpu/sh/Makefile.am b/c/src/exec/score/cpu/sh/Makefile.am index 94ec7eee25..ef260425ab 100644 --- a/c/src/exec/score/cpu/sh/Makefile.am +++ b/c/src/exec/score/cpu/sh/Makefile.am @@ -11,7 +11,7 @@ include $(top_srcdir)/../../../../../../automake/lib.am SUBDIRS = rtems -H_FILES = asm.h +include_HEADERS= asm.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -32,7 +32,7 @@ rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o diff --git a/c/src/exec/score/cpu/sh/rtems/score/Makefile.am b/c/src/exec/score/cpu/sh/rtems/score/Makefile.am index a9b4cae02a..ded700a931 100644 --- a/c/src/exec/score/cpu/sh/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/sh/rtems/score/Makefile.am @@ -4,15 +4,16 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = cpu.h shtypes.h sh.h sh_io.h -noinst_HEADERS = cpu.h shtypes.h sh.h sh_io.h +include_rtems_scoredir = $(includedir)/rtems/score + +include_rtems_score_HEADERS = cpu.h shtypes.h sh.h sh_io.h # # (OPTIONAL) Add local stuff here using += # PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/sparc/ChangeLog b/c/src/exec/score/cpu/sparc/ChangeLog index ad958a08a9..e170e896d7 100644 --- a/c/src/exec/score/cpu/sparc/ChangeLog +++ b/c/src/exec/score/cpu/sparc/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-03 Joel Sherrill * rtems/score/cpu.h: Added _CPU_Initialize_vectors(). diff --git a/c/src/exec/score/cpu/sparc/Makefile.am b/c/src/exec/score/cpu/sparc/Makefile.am index da2370deb8..3f3cd56b8b 100644 --- a/c/src/exec/score/cpu/sparc/Makefile.am +++ b/c/src/exec/score/cpu/sparc/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = rtems C_FILES = cpu.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = asm.h +include_HEADERS = asm.h S_FILES = cpu_asm.S S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) @@ -35,7 +35,7 @@ $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o @@ -44,7 +44,7 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ .PRECIOUS: $(REL) -EXTRA_DIST = asm.h 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/sparc/rtems/score/Makefile.am b/c/src/exec/score/cpu/sparc/rtems/score/Makefile.am index f73fc35933..5868f2446d 100644 --- a/c/src/exec/score/cpu/sparc/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/sparc/rtems/score/Makefile.am @@ -4,15 +4,16 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = cpu.h sparc.h sparctypes.h -noinst_HEADERS = $(H_FILES) +include_rtems_scoredir = $(includedir)/rtems/score + +include_rtems_score_HEADERS = cpu.h sparc.h sparctypes.h # # (OPTIONAL) Add local stuff here using += # PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ - $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/c/src/exec/score/cpu/unix/ChangeLog b/c/src/exec/score/cpu/unix/ChangeLog index dc1e64606e..6d4307ae43 100644 --- a/c/src/exec/score/cpu/unix/ChangeLog +++ b/c/src/exec/score/cpu/unix/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Ralf Corsepius + + * Makefile.am, rtems/score/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-25 Joel Sherrill * cpu.c, rtems/score/cpu.h: Bug report from Peter Mueller diff --git a/c/src/exec/score/cpu/unix/rtems/score/Makefile.am b/c/src/exec/score/cpu/unix/rtems/score/Makefile.am index 899d858130..8b76a65138 100644 --- a/c/src/exec/score/cpu/unix/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/unix/rtems/score/Makefile.am @@ -4,11 +4,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 +include_rtems_scoredir = $(includedir)/rtems/score + GENSIZE = $(PROJECT_TOPdir)/tools/cpu/unix/gensize GENERIC_H_FILES = unixsize.h -STATIC_H_FILES = cpu.h unixtypes.h unix.h -noinst_HEADERS = $(STATIC_H_FILES) +include_rtems_score_HEADERS = cpu.h unixtypes.h unix.h # # (OPTIONAL) Add local stuff here using += @@ -21,8 +22,8 @@ unixsize.h: $(GENSIZE) cpu.h CLEANFILES = unixsize.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ - $(STATIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) \ - $(GENERIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + $(GENERIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ -- cgit v1.2.3