From 4246571bdece86f92da5c8456f6eafead78695bb Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Sat, 3 Apr 2004 00:00:20 +0000
Subject: 2004-04-02	Ralf Corsepius <ralf_corsepius@rtems.org>

	* Makefile.am: Install iregdefs.h and idtcpu.h to
	$(includedir)/rtems/mips.
	* cpu_asm.S: Include <rtems/mips/iregdef.h> instead of <iregdef.h>.
	* rtems/score/mips.h, cpu_asm.S: Include <rtems/mips/idtcpu.h>
	instead of <idtcpu.h>.
---
 cpukit/score/cpu/mips/ChangeLog          |  8 ++++++++
 cpukit/score/cpu/mips/Makefile.am        | 25 +++++++++++++------------
 cpukit/score/cpu/mips/cpu_asm.S          |  4 ++--
 cpukit/score/cpu/mips/rtems/score/mips.h |  2 +-
 4 files changed, 24 insertions(+), 15 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog
index fb28008c94..9624c55c4b 100644
--- a/cpukit/score/cpu/mips/ChangeLog
+++ b/cpukit/score/cpu/mips/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-02	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* Makefile.am: Install iregdefs.h and idtcpu.h to 
+	$(includedir)/rtems/mips.
+	* cpu_asm.S: Include <rtems/mips/iregdef.h> instead of <iregdef.h>.
+	* rtems/score/mips.h, cpu_asm.S: Include <rtems/mips/idtcpu.h>
+	instead of <idtcpu.h>.
+
 2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* Makefile.am: Install asm.h to $(includedir)/rtems.
diff --git a/cpukit/score/cpu/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am
index cbbf00571f..ac1ed2e10b 100644
--- a/cpukit/score/cpu/mips/Makefile.am
+++ b/cpukit/score/cpu/mips/Makefile.am
@@ -10,7 +10,8 @@ include $(top_srcdir)/../../../automake/compile.am
 include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS = asm.h
 
-include_HEADERS = idtcpu.h iregdef.h
+include_rtems_mipsdir = $(includedir)/rtems/mips
+include_rtems_mips_HEADERS = idtcpu.h iregdef.h
 
 include_rtems_scoredir = $(includedir)/rtems/score
 include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/mips.h \
@@ -31,11 +32,6 @@ all-local: $(PREINSTALL_FILES) libscorecpu$(LIB_VARIANT).a
 PREINSTALL_DIRS =
 PREINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
 $(PROJECT_INCLUDE)/rtems/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems
 	@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
@@ -45,13 +41,18 @@ $(PROJECT_INCLUDE)/rtems/asm.h: asm.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/asm.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/asm.h
 
-$(PROJECT_INCLUDE)/idtcpu.h: idtcpu.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/idtcpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/idtcpu.h
+$(PROJECT_INCLUDE)/rtems/mips/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems/mips
+	@: > $(PROJECT_INCLUDE)/rtems/mips/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/mips/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rtems/mips/idtcpu.h: idtcpu.h $(PROJECT_INCLUDE)/rtems/mips/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mips/idtcpu.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mips/idtcpu.h
 
-$(PROJECT_INCLUDE)/iregdef.h: iregdef.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/iregdef.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/iregdef.h
+$(PROJECT_INCLUDE)/rtems/mips/iregdef.h: iregdef.h $(PROJECT_INCLUDE)/rtems/mips/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/mips/iregdef.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/mips/iregdef.h
 
 $(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score
diff --git a/cpukit/score/cpu/mips/cpu_asm.S b/cpukit/score/cpu/mips/cpu_asm.S
index 8afe7c3953..40340d912d 100644
--- a/cpukit/score/cpu/mips/cpu_asm.S
+++ b/cpukit/score/cpu/mips/cpu_asm.S
@@ -44,8 +44,8 @@
  */
 
 #include <rtems/asm.h>
-#include "iregdef.h"
-#include "idtcpu.h"
+#include <rtems/mips/iregdef.h>
+#include <rtems/mips/idtcpu.h>
 
 #define ASSEMBLY_ONLY
 #include <rtems/score/cpu.h>
diff --git a/cpukit/score/cpu/mips/rtems/score/mips.h b/cpukit/score/cpu/mips/rtems/score/mips.h
index f7e252ee7e..2e314ce95b 100644
--- a/cpukit/score/cpu/mips/rtems/score/mips.h
+++ b/cpukit/score/cpu/mips/rtems/score/mips.h
@@ -18,7 +18,7 @@ extern "C" {
 #endif
 
 #ifndef ASM
-#include <idtcpu.h>
+#include <rtems/mips/idtcpu.h>
 #endif
 
 /*
-- 
cgit v1.2.3