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/sh/ChangeLog | 5 +++++ c/src/exec/score/cpu/sh/Makefile.am | 4 ++-- c/src/exec/score/cpu/sh/rtems/score/Makefile.am | 7 ++++--- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'c/src/exec/score/cpu/sh') 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) $@ -- cgit v1.2.3