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