From bb621b05e1ea746d9371baad7a52e153086bdef5 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 5 Mar 2001 22:48:10 +0000
Subject: 2001-03-03	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* shared/cache/Makefile.am, tx39/include/Makefile.am:
	Apply include_*HEADERS instead of H_FILES.
---
 c/src/lib/libcpu/mips/ChangeLog                |  5 +++++
 c/src/lib/libcpu/mips/clock/Makefile.am        |  2 +-
 c/src/lib/libcpu/mips/shared/cache/Makefile.am | 14 +++++++++-----
 c/src/lib/libcpu/mips/tx39/include/Makefile.am |  6 ++++--
 4 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'c/src/lib/libcpu')

diff --git a/c/src/lib/libcpu/mips/ChangeLog b/c/src/lib/libcpu/mips/ChangeLog
index 0a44281d6d..602ca38802 100644
--- a/c/src/lib/libcpu/mips/ChangeLog
+++ b/c/src/lib/libcpu/mips/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-03	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* shared/cache/Makefile.am, tx39/include/Makefile.am:
+	Apply include_*HEADERS instead of H_FILES.
+
 2001-01-08	Joel Sherrill <joel@OARcorp.com>
 
 	* Added r46xx directory.
diff --git a/c/src/lib/libcpu/mips/clock/Makefile.am b/c/src/lib/libcpu/mips/clock/Makefile.am
index 02b8765144..fe5798440d 100644
--- a/c/src/lib/libcpu/mips/clock/Makefile.am
+++ b/c/src/lib/libcpu/mips/clock/Makefile.am
@@ -10,7 +10,7 @@ C_FILES = ckinit.c
 
 S_FILES = clock.S
 
-H_FILES = clock.h
+noinst_HEADERS = clock.h
 
 clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o)
 
diff --git a/c/src/lib/libcpu/mips/shared/cache/Makefile.am b/c/src/lib/libcpu/mips/shared/cache/Makefile.am
index ca04231141..3c0c1b18b8 100644
--- a/c/src/lib/libcpu/mips/shared/cache/Makefile.am
+++ b/c/src/lib/libcpu/mips/shared/cache/Makefile.am
@@ -9,8 +9,10 @@ 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
+
+noinst_HEADERS = cache_.h
+include_libcpu_HEADERS = cache.h
 
 OBJS = $(C_O_FILES)
 
@@ -26,14 +28,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
diff --git a/c/src/lib/libcpu/mips/tx39/include/Makefile.am b/c/src/lib/libcpu/mips/tx39/include/Makefile.am
index 2c680fb005..0227c09f73 100644
--- a/c/src/lib/libcpu/mips/tx39/include/Makefile.am
+++ b/c/src/lib/libcpu/mips/tx39/include/Makefile.am
@@ -4,7 +4,9 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = tx3904.h
+include_libcpudir = $(includedir)/libcpu
+
+include_libcpu_HEADERS = tx3904.h
 
 $(PROJECT_INCLUDE)/libcpu:
 	$(mkinstalldirs) $@
@@ -13,7 +15,7 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
-    $(H_FILES:%.h=$(PROJECT_INCLUDE)/libcpu/%.h)
+    $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
 
 all-local: $(TMPINSTALL_FILES)
 
-- 
cgit v1.2.3