2001-02-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* mpc505/ictrl/Makefile.am, mpc6xx/clock/Makefile.am,
	mpc6xx/exceptions/Makefile.am, mpc6xx/mmu/Makefile.am,
	mpc8xx/include/Makefile.am, new_exception_processing/Makefile.am,
	old_exception_processing/Makefile.am, pc403/ictrl/Makefile.am,
	shared/include/Makefile.am, shared/src/Makefile.am:
	Apply *_HEADERS instead of *H_FILES.
	* shared/src/.cvsignore: Add cache.h.
This commit is contained in:
Joel Sherrill
2001-03-05 22:48:47 +00:00
parent bb56b9f166
commit 98f3cfa1a6
14 changed files with 60 additions and 42 deletions

View File

@@ -7,9 +7,9 @@ AUTOMAKE_OPTIONS = foreign 1.4
C_FILES = cpu.c C_FILES = cpu.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
ROOT_H_FILES = include_rtems_scoredir = $(includedir)/rtems/score
RTEMS_SCORE_H_FILES = cpu.h c_isr.inl
noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES) include_rtems_score_HEADERS = cpu.h c_isr.inl
S_FILES = cpu_asm.S S_FILES = cpu_asm.S
S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
@@ -23,8 +23,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
# #
PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
$(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
$(PROJECT_INCLUDE): $(PROJECT_INCLUDE):
$(mkinstalldirs) $@ $(mkinstalldirs) $@

View File

@@ -8,9 +8,8 @@ AUTOMAKE_OPTIONS = foreign 1.4
C_FILES = cpu.c C_FILES = cpu.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
ROOT_H_FILES = include_rtems_scoredir = $(includedir)/rtems/score
RTEMS_SCORE_H_FILES = cpu.h c_isr.inl ppc_offs.h include_rtems_score_HEADERS = cpu.h c_isr.inl ppc_offs.h
noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES)
# Assembly source names # Assembly source names
S_FILES = cpu_asm.S S_FILES = cpu_asm.S
@@ -21,8 +20,7 @@ include $(top_srcdir)/../../../../../automake/compile.am
include $(top_srcdir)/../../../../../automake/lib.am include $(top_srcdir)/../../../../../automake/lib.am
PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
$(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o

View File

@@ -1,3 +1,13 @@
2001-02-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* mpc505/ictrl/Makefile.am, mpc6xx/clock/Makefile.am,
mpc6xx/exceptions/Makefile.am, mpc6xx/mmu/Makefile.am,
mpc8xx/include/Makefile.am, new_exception_processing/Makefile.am,
old_exception_processing/Makefile.am, pc403/ictrl/Makefile.am,
shared/include/Makefile.am, shared/src/Makefile.am:
Apply *_HEADERS instead of *H_FILES.
* shared/src/.cvsignore: Add cache.h.
2001-01-03 Joel Sherrill <joel@OARcorp.com> 2001-01-03 Joel Sherrill <joel@OARcorp.com>
* new_exception_processing/cpu.h, old_exception_processing/cpu.c: * new_exception_processing/cpu.h, old_exception_processing/cpu.c:

View File

@@ -8,7 +8,7 @@ PGM = $(ARCH)/ictrl.rel
C_FILES = ictrl.c C_FILES = ictrl.c
H_FILES = ictrl.h include_HEADERS = ictrl.h
ictrl_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) ictrl_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
@@ -28,7 +28,8 @@ $(PROJECT_INCLUDE)/%.h: %.h
$(PGM): $(ictrl_rel_OBJECTS) $(PGM): $(ictrl_rel_OBJECTS)
$(make-rel) $(make-rel)
TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/ictrl.h TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(ARCH) $(ictrl_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES) all-local: $(ARCH) $(ictrl_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)

View File

@@ -6,7 +6,9 @@ AUTOMAKE_OPTIONS = foreign 1.4
C_FILES = c_clock.c C_FILES = c_clock.c
H_FILES = c_clock.h include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = c_clock.h
c_clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) c_clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
@@ -24,7 +26,7 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h
# #
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
$(PROJECT_INCLUDE)/libcpu/c_clock.h $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(c_clock_rel_OBJECTS) all-local: $(ARCH) $(PREINSTALL_FILES) $(c_clock_rel_OBJECTS)

View File

@@ -10,7 +10,9 @@ C_FILES = raw_exception.c
S_FILES = asm_utils.S S_FILES = asm_utils.S
H_FILES = raw_exception.h include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = raw_exception.h
exceptions_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) \ exceptions_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) \
$(S_FILES:%.S=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o)
@@ -32,7 +34,7 @@ $(PGM): $(exceptions_rel_OBJECTS)
$(make-rel) $(make-rel)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
$(PROJECT_INCLUDE)/libcpu/raw_exception.h $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(exceptions_rel_OBJECTS) $(PGM) all-local: $(ARCH) $(PREINSTALL_FILES) $(exceptions_rel_OBJECTS) $(PGM)

View File

@@ -10,7 +10,9 @@ C_FILES = bat.c
S_FILES = mmuAsm.S S_FILES = mmuAsm.S
H_FILES = bat.h include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = bat.h
mmu_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o) mmu_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o)
@@ -31,7 +33,7 @@ $(PGM): $(mmu_rel_OBJECTS)
$(make-rel) $(make-rel)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
$(PROJECT_INCLUDE)/libcpu/bat.h $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(mmu_rel_OBJECTS) $(PGM) all-local: $(ARCH) $(PREINSTALL_FILES) $(mmu_rel_OBJECTS) $(PGM)

View File

@@ -4,14 +4,14 @@
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.4
H_FILES = mpc8xx.h include_mpc8xxdir = $(includedir)/mpc8xx
MPC8XX_H_FILES = console.h cpm.h mmu.h
noinst_HEADERS = $(H_FILES) $(MPC8XX_H_FILES) include_HEADERS = mpc8xx.h
include_mpc8xx_HEADERS = console.h cpm.h mmu.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx \ PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx \
$(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \
$(MPC8XX_H_FILES:%.h=$(PROJECT_INCLUDE)/mpc8xx/%.h) $(include_mpc8xx_HEADERS:%=$(PROJECT_INCLUDE)/mpc8xx/%)
$(PROJECT_INCLUDE)/mpc8xx: $(PROJECT_INCLUDE)/mpc8xx:
$(mkinstalldirs) $@ $(mkinstalldirs) $@

View File

@@ -7,9 +7,9 @@ AUTOMAKE_OPTIONS = foreign 1.4
C_FILES = cpu.c C_FILES = cpu.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
ROOT_H_FILES = include_rtems_scoredir = $(includedir)/rtems/score
RTEMS_SCORE_H_FILES = cpu.h c_isr.inl
noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES) include_rtems_score_HEADERS = cpu.h c_isr.inl
S_FILES = cpu_asm.S S_FILES = cpu_asm.S
S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
@@ -23,8 +23,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
# #
PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
$(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
$(PROJECT_INCLUDE): $(PROJECT_INCLUDE):
$(mkinstalldirs) $@ $(mkinstalldirs) $@

View File

@@ -8,9 +8,8 @@ AUTOMAKE_OPTIONS = foreign 1.4
C_FILES = cpu.c C_FILES = cpu.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
ROOT_H_FILES = include_rtems_scoredir = $(includedir)/rtems/score
RTEMS_SCORE_H_FILES = cpu.h c_isr.inl ppc_offs.h include_rtems_score_HEADERS = cpu.h c_isr.inl ppc_offs.h
noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES)
# Assembly source names # Assembly source names
S_FILES = cpu_asm.S S_FILES = cpu_asm.S
@@ -21,8 +20,7 @@ include $(top_srcdir)/../../../../../automake/compile.am
include $(top_srcdir)/../../../../../automake/lib.am include $(top_srcdir)/../../../../../automake/lib.am
PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
$(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o

View File

@@ -8,7 +8,7 @@ PGM = $(ARCH)/ictrl.rel
C_FILES = ictrl.c C_FILES = ictrl.c
H_FILES = ictrl.h include_HEADERS = ictrl.h
ictrl_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) ictrl_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
@@ -28,7 +28,8 @@ $(PROJECT_INCLUDE)/%.h: %.h
$(PGM): $(ictrl_rel_OBJECTS) $(PGM): $(ictrl_rel_OBJECTS)
$(make-rel) $(make-rel)
TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/ictrl.h TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(ARCH) $(ictrl_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES) all-local: $(ARCH) $(ictrl_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)

View File

@@ -7,7 +7,9 @@ AUTOMAKE_OPTIONS = foreign 1.4
C_FILES = cpuIdent.c C_FILES = cpuIdent.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
H_FILES = cpu.h spr.h io.h mmu.h page.h byteorder.h pgtable.h include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = cpu.h spr.h io.h mmu.h page.h byteorder.h pgtable.h
OBJS = $(C_O_FILES) OBJS = $(C_O_FILES)
@@ -31,7 +33,7 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h
$(INSTALL_DATA) $< $@ $(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
$(H_FILES:%=$(PROJECT_INCLUDE)/libcpu/%) $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)

View File

@@ -1,2 +1,3 @@
Makefile Makefile
Makefile.in Makefile.in
cache.h

View File

@@ -9,8 +9,9 @@ VPATH = @srcdir@:@srcdir@/../../../shared/src
C_FILES = cache.c cache_aligned_malloc.c cache_manager.c C_FILES = cache.c cache_aligned_malloc.c cache_manager.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
H_FILES = cache_.h include_libcpudir = $(includedir)/libcpu
INSTALLED_H_FILES =
include_libcpu_HEADERS = cache_.h cache.h
OBJS = $(C_O_FILES) OBJS = $(C_O_FILES)
@@ -26,14 +27,16 @@ $(PROJECT_INCLUDE)/libcpu:
$(PROJECT_INCLUDE)/libcpu/%.h: %.h $(PROJECT_INCLUDE)/libcpu/%.h: %.h
$(INSTALL_DATA) $< $@ $(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/libcpu/cache.h: $(top_srcdir)/../shared/include/cache.h cache.h: $(top_srcdir)/../shared/include/cache.h
$(INSTALL_DATA) $< $@ cp $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
$(PROJECT_INCLUDE)/libcpu/cache.h $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS)
CLEANFILES += cache.h
EXTRA_DIST = cache.c cache_.h EXTRA_DIST = cache.c cache_.h
include $(top_srcdir)/../../../../../automake/local.am include $(top_srcdir)/../../../../../automake/local.am