summaryrefslogtreecommitdiffstats
path: root/c/src/lib
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-03-05 22:48:47 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-03-05 22:48:47 +0000
commit98f3cfa1a614dfbf8ab261b8b1a85043f0086764 (patch)
tree95a24fc48fad57285655a84c2f35dc7a1ee3ea47 /c/src/lib
parent2001-03-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-98f3cfa1a614dfbf8ab261b8b1a85043f0086764.tar.bz2
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.
Diffstat (limited to 'c/src/lib')
-rw-r--r--c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am9
-rw-r--r--c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am8
-rw-r--r--c/src/lib/libcpu/powerpc/ChangeLog10
-rw-r--r--c/src/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am5
-rw-r--r--c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am6
-rw-r--r--c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am6
-rw-r--r--c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am6
-rw-r--r--c/src/lib/libcpu/powerpc/mpc8xx/include/Makefile.am10
-rw-r--r--c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am9
-rw-r--r--c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am8
-rw-r--r--c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am5
-rw-r--r--c/src/lib/libcpu/powerpc/shared/include/Makefile.am6
-rw-r--r--c/src/lib/libcpu/powerpc/shared/src/.cvsignore1
-rw-r--r--c/src/lib/libcpu/powerpc/shared/src/Makefile.am13
14 files changed, 60 insertions, 42 deletions
diff --git a/c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am b/c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am
index 62f495e867..898c310db3 100644
--- a/c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am
@@ -7,9 +7,9 @@ AUTOMAKE_OPTIONS = foreign 1.4
C_FILES = cpu.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-ROOT_H_FILES =
-RTEMS_SCORE_H_FILES = cpu.h c_isr.inl
-noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES)
+include_rtems_scoredir = $(includedir)/rtems/score
+
+include_rtems_score_HEADERS = cpu.h c_isr.inl
S_FILES = cpu_asm.S
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 \
- $(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
- $(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
+ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am b/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am
index 62caa2c4bd..8d20194a98 100644
--- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am
@@ -8,9 +8,8 @@ AUTOMAKE_OPTIONS = foreign 1.4
C_FILES = cpu.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-ROOT_H_FILES =
-RTEMS_SCORE_H_FILES = cpu.h c_isr.inl ppc_offs.h
-noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES)
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS = cpu.h c_isr.inl ppc_offs.h
# Assembly source names
S_FILES = cpu_asm.S
@@ -21,8 +20,7 @@ include $(top_srcdir)/../../../../../automake/compile.am
include $(top_srcdir)/../../../../../automake/lib.am
PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
- $(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
- $(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
+ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index 0b5f9d721d..b99df7b1a6 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -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>
* new_exception_processing/cpu.h, old_exception_processing/cpu.c:
diff --git a/c/src/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am
index 2c60b11cc9..a9955fc314 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am
@@ -8,7 +8,7 @@ PGM = $(ARCH)/ictrl.rel
C_FILES = ictrl.c
-H_FILES = ictrl.h
+include_HEADERS = ictrl.h
ictrl_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
@@ -28,7 +28,8 @@ $(PROJECT_INCLUDE)/%.h: %.h
$(PGM): $(ictrl_rel_OBJECTS)
$(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)
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
index d6b82f58d8..8156579206 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
@@ -6,7 +6,9 @@ AUTOMAKE_OPTIONS = foreign 1.4
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)
@@ -24,7 +26,7 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h
#
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)
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
index d79699810d..7bc445eae4 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
@@ -10,7 +10,9 @@ C_FILES = raw_exception.c
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) \
$(S_FILES:%.S=$(ARCH)/%.o)
@@ -32,7 +34,7 @@ $(PGM): $(exceptions_rel_OBJECTS)
$(make-rel)
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)
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
index 2602ba765c..30415a0671 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
@@ -10,7 +10,9 @@ C_FILES = bat.c
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)
@@ -31,7 +33,7 @@ $(PGM): $(mmu_rel_OBJECTS)
$(make-rel)
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)
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/include/Makefile.am
index 39c709fe92..cfb3e923ea 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/include/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/include/Makefile.am
@@ -4,14 +4,14 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = mpc8xx.h
-MPC8XX_H_FILES = console.h cpm.h mmu.h
+include_mpc8xxdir = $(includedir)/mpc8xx
-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 \
- $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
- $(MPC8XX_H_FILES:%.h=$(PROJECT_INCLUDE)/mpc8xx/%.h)
+ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \
+ $(include_mpc8xx_HEADERS:%=$(PROJECT_INCLUDE)/mpc8xx/%)
$(PROJECT_INCLUDE)/mpc8xx:
$(mkinstalldirs) $@
diff --git a/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am b/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am
index 62f495e867..898c310db3 100644
--- a/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am
@@ -7,9 +7,9 @@ AUTOMAKE_OPTIONS = foreign 1.4
C_FILES = cpu.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-ROOT_H_FILES =
-RTEMS_SCORE_H_FILES = cpu.h c_isr.inl
-noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES)
+include_rtems_scoredir = $(includedir)/rtems/score
+
+include_rtems_score_HEADERS = cpu.h c_isr.inl
S_FILES = cpu_asm.S
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 \
- $(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
- $(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
+ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
diff --git a/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am b/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am
index 62caa2c4bd..8d20194a98 100644
--- a/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am
@@ -8,9 +8,8 @@ AUTOMAKE_OPTIONS = foreign 1.4
C_FILES = cpu.c
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-ROOT_H_FILES =
-RTEMS_SCORE_H_FILES = cpu.h c_isr.inl ppc_offs.h
-noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES)
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS = cpu.h c_isr.inl ppc_offs.h
# Assembly source names
S_FILES = cpu_asm.S
@@ -21,8 +20,7 @@ include $(top_srcdir)/../../../../../automake/compile.am
include $(top_srcdir)/../../../../../automake/lib.am
PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
- $(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
- $(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
+ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
diff --git a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
index 2c60b11cc9..54420aa645 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
@@ -8,7 +8,7 @@ PGM = $(ARCH)/ictrl.rel
C_FILES = ictrl.c
-H_FILES = ictrl.h
+include_HEADERS = ictrl.h
ictrl_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
@@ -28,7 +28,8 @@ $(PROJECT_INCLUDE)/%.h: %.h
$(PGM): $(ictrl_rel_OBJECTS)
$(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)
diff --git a/c/src/lib/libcpu/powerpc/shared/include/Makefile.am b/c/src/lib/libcpu/powerpc/shared/include/Makefile.am
index 3fc822d555..5b7e936557 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/shared/include/Makefile.am
@@ -7,7 +7,9 @@ AUTOMAKE_OPTIONS = foreign 1.4
C_FILES = cpuIdent.c
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)
@@ -31,7 +33,7 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
- $(H_FILES:%=$(PROJECT_INCLUDE)/libcpu/%)
+ $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
diff --git a/c/src/lib/libcpu/powerpc/shared/src/.cvsignore b/c/src/lib/libcpu/powerpc/shared/src/.cvsignore
index 282522db03..f83c19e96a 100644
--- a/c/src/lib/libcpu/powerpc/shared/src/.cvsignore
+++ b/c/src/lib/libcpu/powerpc/shared/src/.cvsignore
@@ -1,2 +1,3 @@
Makefile
Makefile.in
+cache.h \ No newline at end of file
diff --git a/c/src/lib/libcpu/powerpc/shared/src/Makefile.am b/c/src/lib/libcpu/powerpc/shared/src/Makefile.am
index ca04231141..5fdf51d56f 100644
--- a/c/src/lib/libcpu/powerpc/shared/src/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/shared/src/Makefile.am
@@ -9,8 +9,9 @@ VPATH = @srcdir@:@srcdir@/../../../shared/src
C_FILES = cache.c cache_aligned_malloc.c cache_manager.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
-H_FILES = cache_.h
-INSTALLED_H_FILES =
+include_libcpudir = $(includedir)/libcpu
+
+include_libcpu_HEADERS = cache_.h cache.h
OBJS = $(C_O_FILES)
@@ -26,14 +27,16 @@ $(PROJECT_INCLUDE)/libcpu:
$(PROJECT_INCLUDE)/libcpu/%.h: %.h
$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/libcpu/cache.h: $(top_srcdir)/../shared/include/cache.h
- $(INSTALL_DATA) $< $@
+cache.h: $(top_srcdir)/../shared/include/cache.h
+ cp $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
- $(PROJECT_INCLUDE)/libcpu/cache.h
+ $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS)
+CLEANFILES += cache.h
+
EXTRA_DIST = cache.c cache_.h
include $(top_srcdir)/../../../../../automake/local.am
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 07:51:11 +0000