diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-01 14:09:00 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-01 14:09:00 +0000 |
| commit | 5f8d82b77316361be0352330dac0adfb1db2df9a (patch) | |
| tree | 816086e0b1426815f012296afb9d01c3d9400780 /cpukit/score | |
| parent | 2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-5f8d82b77316361be0352330dac0adfb1db2df9a.tar.bz2 | |
2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org>
* Makefile.am: Install asm.h to $(includedir)/rtems.
Diffstat (limited to '')
24 files changed, 165 insertions, 84 deletions
diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog index 050ee1a273..8116575489 100644 --- a/cpukit/score/cpu/arm/ChangeLog +++ b/cpukit/score/cpu/arm/ChangeLog @@ -1,5 +1,9 @@ 2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + * Makefile.am: Install asm.h to $(includedir)/rtems. + +2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + * cpu_asm.S: Include <rtems/asm.h> instead of <asm.h>. 2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org> diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am index 430542b61a..0320eb4c22 100644 --- a/cpukit/score/cpu/arm/Makefile.am +++ b/cpukit/score/cpu/arm/Makefile.am @@ -7,7 +7,8 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../automake/compile.am -include_HEADERS = asm.h +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = asm.h include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/cpu_asm.h \ @@ -28,14 +29,14 @@ 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) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) -$(PROJECT_INCLUDE)/asm.h: asm.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h +$(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)/rtems/score/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score diff --git a/cpukit/score/cpu/c4x/ChangeLog b/cpukit/score/cpu/c4x/ChangeLog index 6b58abce63..d1811bfe6a 100644 --- a/cpukit/score/cpu/c4x/ChangeLog +++ b/cpukit/score/cpu/c4x/ChangeLog @@ -1,5 +1,9 @@ 2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + * Makefile.am: Install asm.h to $(includedir)/rtems. + +2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + * cpu_asm.S: Include <rtems/asm.h> instead of <asm.h>. 2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org> diff --git a/cpukit/score/cpu/c4x/Makefile.am b/cpukit/score/cpu/c4x/Makefile.am index 0831e5af64..05ba487a32 100644 --- a/cpukit/score/cpu/c4x/Makefile.am +++ b/cpukit/score/cpu/c4x/Makefile.am @@ -7,7 +7,10 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../automake/compile.am -include_HEADERS = asm.h c4xio.h +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = asm.h + +include_HEADERS = c4xio.h include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/c4x.h \ @@ -33,9 +36,14 @@ $(PROJECT_INCLUDE)/$(dirstamp): @: > $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) -$(PROJECT_INCLUDE)/asm.h: asm.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h +$(PROJECT_INCLUDE)/rtems/$(dirstamp): + @$(mkdir_p) $(PROJECT_INCLUDE)/rtems + @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) + +$(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)/c4xio.h: c4xio.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/c4xio.h diff --git a/cpukit/score/cpu/h8300/ChangeLog b/cpukit/score/cpu/h8300/ChangeLog index 8615f81197..80e8380551 100644 --- a/cpukit/score/cpu/h8300/ChangeLog +++ b/cpukit/score/cpu/h8300/ChangeLog @@ -1,3 +1,7 @@ +2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + + * Makefile.am: Install asm.h to $(includedir)/rtems. + 2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org> * cpu.c, rtems/score/cpu.h: Convert to using c99 fixed size types. diff --git a/cpukit/score/cpu/h8300/Makefile.am b/cpukit/score/cpu/h8300/Makefile.am index 9351dacca2..00fa841e16 100644 --- a/cpukit/score/cpu/h8300/Makefile.am +++ b/cpukit/score/cpu/h8300/Makefile.am @@ -7,7 +7,8 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../automake/compile.am -include_HEADERS = asm.h +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = asm.h include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/h8300.h \ @@ -28,14 +29,14 @@ 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) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) -$(PROJECT_INCLUDE)/asm.h: asm.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h +$(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)/rtems/score/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score diff --git a/cpukit/score/cpu/i386/ChangeLog b/cpukit/score/cpu/i386/ChangeLog index c014fc1dd0..5ca223af4f 100644 --- a/cpukit/score/cpu/i386/ChangeLog +++ b/cpukit/score/cpu/i386/ChangeLog @@ -1,5 +1,9 @@ 2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + * Makefile.am: Install asm.h to $(includedir)/rtems. + +2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + * cpu_asm.S: Include <rtems/asm.h> instead of <asm.h>. 2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org> diff --git a/cpukit/score/cpu/i386/Makefile.am b/cpukit/score/cpu/i386/Makefile.am index 0f8423dde1..1af85ad421 100644 --- a/cpukit/score/cpu/i386/Makefile.am +++ b/cpukit/score/cpu/i386/Makefile.am @@ -7,7 +7,8 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../automake/compile.am -include_HEADERS= asm.h +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS= asm.h include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/i386.h \ @@ -29,14 +30,14 @@ 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) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) -$(PROJECT_INCLUDE)/asm.h: asm.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h +$(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)/rtems/score/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score diff --git a/cpukit/score/cpu/i960/ChangeLog b/cpukit/score/cpu/i960/ChangeLog index 2e8a37927a..7ef57e380b 100644 --- a/cpukit/score/cpu/i960/ChangeLog +++ b/cpukit/score/cpu/i960/ChangeLog @@ -1,3 +1,7 @@ +2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + + * Makefile.am: Install asm.h to $(includedir)/rtems. + 2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org> * cpu.c, rtems/score/cpu.h: Convert to using c99 fixed size types. diff --git a/cpukit/score/cpu/i960/Makefile.am b/cpukit/score/cpu/i960/Makefile.am index d5c97339b2..835c6e0fb0 100644 --- a/cpukit/score/cpu/i960/Makefile.am +++ b/cpukit/score/cpu/i960/Makefile.am @@ -7,7 +7,8 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../automake/compile.am -include_HEADERS = asm.h +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = asm.h include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/i960.h \ @@ -28,14 +29,14 @@ 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) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) -$(PROJECT_INCLUDE)/asm.h: asm.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h +$(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)/rtems/score/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog index fb23fee89f..8b1e812a7b 100644 --- a/cpukit/score/cpu/m68k/ChangeLog +++ b/cpukit/score/cpu/m68k/ChangeLog @@ -1,5 +1,9 @@ 2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + * Makefile.am: Install asm.h to $(includedir)/rtems. + +2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + * cpu_asm.S: Include <rtems/asm.h> instead of <asm.h>. 2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org> diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am index ab885b566d..8d13717a7e 100644 --- a/cpukit/score/cpu/m68k/Makefile.am +++ b/cpukit/score/cpu/m68k/Makefile.am @@ -15,7 +15,10 @@ EXTRA_LIBRARIES += libscorecpu_g.a CLEANFILES += libscorecpu_g.a libscorecpu_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -include_HEADERS = asm.h m68302.h m68360.h qsm.h sim.h +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = asm.h + +include_HEADERS = m68302.h m68360.h qsm.h sim.h include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/m68k.h \ @@ -35,9 +38,14 @@ $(PROJECT_INCLUDE)/$(dirstamp): @: > $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) -$(PROJECT_INCLUDE)/asm.h: asm.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h +$(PROJECT_INCLUDE)/rtems/$(dirstamp): + @$(mkdir_p) $(PROJECT_INCLUDE)/rtems + @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) + +$(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)/m68302.h: m68302.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68302.h diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog index 9f3506ad9e..fb28008c94 100644 --- a/cpukit/score/cpu/mips/ChangeLog +++ b/cpukit/score/cpu/mips/ChangeLog @@ -1,5 +1,9 @@ 2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + * Makefile.am: Install asm.h to $(includedir)/rtems. + +2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + * cpu_asm.S: Include <rtems/asm.h> instead of <asm.h>. 2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org> diff --git a/cpukit/score/cpu/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am index 64324b191f..cbbf00571f 100644 --- a/cpukit/score/cpu/mips/Makefile.am +++ b/cpukit/score/cpu/mips/Makefile.am @@ -7,7 +7,10 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../automake/compile.am -include_HEADERS = asm.h idtcpu.h iregdef.h +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = asm.h + +include_HEADERS = idtcpu.h iregdef.h include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/mips.h \ @@ -33,9 +36,14 @@ $(PROJECT_INCLUDE)/$(dirstamp): @: > $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) -$(PROJECT_INCLUDE)/asm.h: asm.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h +$(PROJECT_INCLUDE)/rtems/$(dirstamp): + @$(mkdir_p) $(PROJECT_INCLUDE)/rtems + @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) + +$(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 diff --git a/cpukit/score/cpu/no_cpu/ChangeLog b/cpukit/score/cpu/no_cpu/ChangeLog index 0faae64834..effa726dde 100644 --- a/cpukit/score/cpu/no_cpu/ChangeLog +++ b/cpukit/score/cpu/no_cpu/ChangeLog @@ -1,3 +1,7 @@ +2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + + * Makefile.am: Install asm.h to $(includedir)/rtems. + 2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org> * cpu.c, rtems/score/cpu.h: Convert to using c99 fixed size types. diff --git a/cpukit/score/cpu/no_cpu/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am index a1588465fb..777c1c8302 100644 --- a/cpukit/score/cpu/no_cpu/Makefile.am +++ b/cpukit/score/cpu/no_cpu/Makefile.am @@ -7,7 +7,8 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../automake/compile.am -include_HEADERS = asm.h +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = asm.h include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/no_cpu.h \ @@ -28,14 +29,14 @@ 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) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) -$(PROJECT_INCLUDE)/asm.h: asm.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h +$(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)/rtems/score/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score diff --git a/cpukit/score/cpu/or32/ChangeLog b/cpukit/score/cpu/or32/ChangeLog index 50d6fc8daa..d8b27a1b46 100644 --- a/cpukit/score/cpu/or32/ChangeLog +++ b/cpukit/score/cpu/or32/ChangeLog @@ -1,3 +1,7 @@ +2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + + * Makefile.am: Install asm.h to $(includedir)/rtems. + 2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org> * cpu.c, cpu_asm.c, rtems/score/cpu.h: Convert to using c99 fixed diff --git a/cpukit/score/cpu/or32/Makefile.am b/cpukit/score/cpu/or32/Makefile.am index 56c5e35428..8e50ae5274 100644 --- a/cpukit/score/cpu/or32/Makefile.am +++ b/cpukit/score/cpu/or32/Makefile.am @@ -7,7 +7,8 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../automake/compile.am -include_HEADERS= asm.h +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS= asm.h include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/types.h \ @@ -28,14 +29,14 @@ 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) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) -$(PROJECT_INCLUDE)/asm.h: asm.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h +$(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)/rtems/score/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog index 69f2e47c37..133e8f4c95 100644 --- a/cpukit/score/cpu/powerpc/ChangeLog +++ b/cpukit/score/cpu/powerpc/ChangeLog @@ -1,3 +1,7 @@ +2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + + * Makefile.am: Install asm.h to $(includedir)/rtems. + 2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org> * rtems/new-exceptions/cpu.h, rtems/old-exceptions/cpu.h, diff --git a/cpukit/score/cpu/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am index 504bfaf01b..d2baad821b 100644 --- a/cpukit/score/cpu/powerpc/Makefile.am +++ b/cpukit/score/cpu/powerpc/Makefile.am @@ -7,7 +7,8 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../automake/compile.am -include_HEADERS = asm.h +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = asm.h include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/ppc.h rtems/score/types.h @@ -27,14 +28,14 @@ all-local: $(PREINSTALL_FILES) 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) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) -$(PROJECT_INCLUDE)/asm.h: asm.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h +$(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)/rtems/score/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score diff --git a/cpukit/score/cpu/sh/ChangeLog b/cpukit/score/cpu/sh/ChangeLog index 11a1cbfe22..34942b0e54 100644 --- a/cpukit/score/cpu/sh/ChangeLog +++ b/cpukit/score/cpu/sh/ChangeLog @@ -1,3 +1,7 @@ +2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + + * Makefile.am: Install asm.h to $(includedir)/rtems. + 2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org> * cpu.c, rtems/score/cpu.h, rtems/score/sh.h, rtems/score/sh_io.h: diff --git a/cpukit/score/cpu/sh/Makefile.am b/cpukit/score/cpu/sh/Makefile.am index 18c1ea7237..4f99870af7 100644 --- a/cpukit/score/cpu/sh/Makefile.am +++ b/cpukit/score/cpu/sh/Makefile.am @@ -7,7 +7,8 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../automake/compile.am -include_HEADERS= asm.h +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS= asm.h include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/types.h \ @@ -28,14 +29,14 @@ 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) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) -$(PROJECT_INCLUDE)/asm.h: asm.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h +$(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)/rtems/score/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score diff --git a/cpukit/score/cpu/sparc/ChangeLog b/cpukit/score/cpu/sparc/ChangeLog index cd43b46789..849c3c41f5 100644 --- a/cpukit/score/cpu/sparc/ChangeLog +++ b/cpukit/score/cpu/sparc/ChangeLog @@ -1,5 +1,9 @@ 2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + * Makefile.am: Install asm.h to $(includedir)/rtems. + +2004-04-01 Ralf Corsepius <ralf_corsepius@rtems.org> + * cpu_asm.S: Include <rtems/asm.h> instead of <asm.h>. 2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org> diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am index 966963c086..b5eb50d3fd 100644 --- a/cpukit/score/cpu/sparc/Makefile.am +++ b/cpukit/score/cpu/sparc/Makefile.am @@ -7,7 +7,8 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../automake/compile.am -include_HEADERS= asm.h +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = asm.h include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/sparc.h rtems/score/cpu.h \ @@ -28,14 +29,14 @@ 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) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp) -$(PROJECT_INCLUDE)/asm.h: asm.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h +$(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)/rtems/score/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score |