From f6273a005c8ddec05036568f80e4386e4f9ee628 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 1 Dec 2003 12:03:28 +0000 Subject: 2003-12-01 Ralf Corsepius * Makefile.am: Reformat. Use dirstamps for preinstallation. --- c/src/lib/libcpu/sh/sh7032/ChangeLog | 4 +++ c/src/lib/libcpu/sh/sh7032/Makefile.am | 49 +++++++++++++++++---------- c/src/lib/libcpu/sh/sh7045/ChangeLog | 4 +++ c/src/lib/libcpu/sh/sh7045/Makefile.am | 57 ++++++++++++++++++++++---------- c/src/lib/libcpu/sh/sh7750/ChangeLog | 4 +++ c/src/lib/libcpu/sh/sh7750/Makefile.am | 60 ++++++++++++++++++++++------------ 6 files changed, 123 insertions(+), 55 deletions(-) diff --git a/c/src/lib/libcpu/sh/sh7032/ChangeLog b/c/src/lib/libcpu/sh/sh7032/ChangeLog index 531ca30319..524aa40f9f 100644 --- a/c/src/lib/libcpu/sh/sh7032/ChangeLog +++ b/c/src/lib/libcpu/sh/sh7032/ChangeLog @@ -1,3 +1,7 @@ +2003-12-01 Ralf Corsepius + + * Makefile.am: Reformat. Use dirstamps for preinstallation. + 2003-10-22 Ralf Corsepius * configure.ac: Remove RTEMS_CANONICAL_HOST. diff --git a/c/src/lib/libcpu/sh/sh7032/Makefile.am b/c/src/lib/libcpu/sh/sh7032/Makefile.am index c84908865e..d5e7f2d45b 100644 --- a/c/src/lib/libcpu/sh/sh7032/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/Makefile.am @@ -15,23 +15,6 @@ include_rtems_scoredir = $(includedir)/rtems/score include_sh_HEADERS = include/sci.h include/sh7_pfc.h include/sh7_sci.h include_rtems_score_HEADERS = include/ispsh7032.h include/iosh7032.h -$(PROJECT_INCLUDE)/sh: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/sh/%.h: include/%.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/rtems/score: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/rtems/score/%.h: include/%.h - $(INSTALL_DATA) $< $@ - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/sh \ - $(include_sh_HEADERS:include/%.h=$(PROJECT_INCLUDE)/sh/%.h) \ - $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:include/%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) - # clock PGMS = $(ARCH)/clock.rel @@ -101,4 +84,36 @@ all-local: $(ARCH) $(PGMS) $(TMPINSTALL_FILES) .PRECIOUS: $(PGMS) +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/sh/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/sh + @: > $(PROJECT_INCLUDE)/sh/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/$(dirstamp) + +$(PROJECT_INCLUDE)/rtems/score/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score + @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + +$(PROJECT_INCLUDE)/sh/sci.h: include/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h + +$(PROJECT_INCLUDE)/sh/sh7_pfc.h: include/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h + +$(PROJECT_INCLUDE)/sh/sh7_sci.h: include/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h + +$(PROJECT_INCLUDE)/rtems/score/ispsh7032.h: include/ispsh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h + +$(PROJECT_INCLUDE)/rtems/score/iosh7032.h: include/iosh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7032.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7032.h + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/ChangeLog b/c/src/lib/libcpu/sh/sh7045/ChangeLog index 56246f8fd3..d4b3b33d07 100644 --- a/c/src/lib/libcpu/sh/sh7045/ChangeLog +++ b/c/src/lib/libcpu/sh/sh7045/ChangeLog @@ -1,3 +1,7 @@ +2003-12-01 Ralf Corsepius + + * Makefile.am: Reformat. Use dirstamps for preinstallation. + 2003-10-22 Ralf Corsepius * configure.ac: Remove RTEMS_CANONICAL_HOST. diff --git a/c/src/lib/libcpu/sh/sh7045/Makefile.am b/c/src/lib/libcpu/sh/sh7045/Makefile.am index b4f45b644d..442179a8d3 100644 --- a/c/src/lib/libcpu/sh/sh7045/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/Makefile.am @@ -16,23 +16,6 @@ include_sh_HEADERS = include/io_types.h include/sci.h include/sh7_pfc.h \ include/sh7_sci.h include/sci_termios.h include_rtems_score_HEADERS = include/ispsh7045.h include/iosh7045.h -$(PROJECT_INCLUDE)/sh: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/sh/%.h: include/%.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/rtems/score: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/rtems/score/%.h: include/%.h - $(INSTALL_DATA) $< $@ - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/sh \ - $(include_sh_HEADERS:include/%=$(PROJECT_INCLUDE)/sh/%) \ - $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:include/%=$(PROJECT_INCLUDE)/rtems/score/%) - # clock PGMS = $(ARCH)/clock.rel @@ -89,4 +72,44 @@ all-local: $(ARCH) $(PGMS) $(TMPINSTALL_FILES) .PRECIOUS: $(PGMS) +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/sh/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/sh + @: > $(PROJECT_INCLUDE)/sh/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/$(dirstamp) + +$(PROJECT_INCLUDE)/rtems/score/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score + @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + +$(PROJECT_INCLUDE)/sh/io_types.h: include/io_types.h $(PROJECT_INCLUDE)/sh/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/io_types.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/io_types.h + +$(PROJECT_INCLUDE)/sh/sci.h: include/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h + +$(PROJECT_INCLUDE)/sh/sh7_pfc.h: include/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h + +$(PROJECT_INCLUDE)/sh/sh7_sci.h: include/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h + +$(PROJECT_INCLUDE)/sh/sci_termios.h: include/sci_termios.h $(PROJECT_INCLUDE)/sh/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci_termios.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci_termios.h + +$(PROJECT_INCLUDE)/rtems/score/ispsh7045.h: include/ispsh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h + +$(PROJECT_INCLUDE)/rtems/score/iosh7045.h: include/iosh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7045.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7045.h + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7750/ChangeLog b/c/src/lib/libcpu/sh/sh7750/ChangeLog index 0d063dcedb..f054a900c4 100644 --- a/c/src/lib/libcpu/sh/sh7750/ChangeLog +++ b/c/src/lib/libcpu/sh/sh7750/ChangeLog @@ -1,3 +1,7 @@ +2003-12-01 Ralf Corsepius + + * Makefile.am: Reformat. Use dirstamps for preinstallation. + 2003-10-22 Ralf Corsepius * configure.ac: Remove RTEMS_CANONICAL_HOST. diff --git a/c/src/lib/libcpu/sh/sh7750/Makefile.am b/c/src/lib/libcpu/sh/sh7750/Makefile.am index 7ef57f9022..7c81cd6488 100644 --- a/c/src/lib/libcpu/sh/sh7750/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7750/Makefile.am @@ -13,27 +13,9 @@ include_shdir = $(includedir)/sh include_rtems_scoredir = $(includedir)/rtems/score include_sh_HEADERS = include/sh/sh4uart.h -include_rtems_score_HEADERS = \ -include/rtems/score/sh7750_regs.h \ -include/rtems/score/ipl.h \ -include/rtems/score/iosh7750.h \ -include/rtems/score/ispsh7750.h \ -include/rtems/score/sh4_regs.h - -$(PROJECT_INCLUDE)/sh: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/rtems/score: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: include/%.h - $(INSTALL_DATA) $< $@ - -PREINSTALL_FILES = \ - $(PROJECT_INCLUDE)/sh \ - $(include_sh_HEADERS:include/%=$(PROJECT_INCLUDE)/%) \ - $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:include/%=$(PROJECT_INCLUDE)/%) +include_rtems_score_HEADERS = include/rtems/score/sh7750_regs.h \ + include/rtems/score/ipl.h include/rtems/score/iosh7750.h \ + include/rtems/score/ispsh7750.h include/rtems/score/sh4_regs.h all-local: $(TMPINSTALL_FILES) @@ -95,4 +77,40 @@ all-local: $(ARCH) $(PGMS) $(TMPINSTALL_FILES) .PRECIOUS: $(PGMS) +PREINSTALL_FILES = + +$(PROJECT_INCLUDE)/sh/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/sh + @: > $(PROJECT_INCLUDE)/sh/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/$(dirstamp) + +$(PROJECT_INCLUDE)/rtems/score/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score + @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + +$(PROJECT_INCLUDE)/sh/sh4uart.h: include/sh/sh4uart.h $(PROJECT_INCLUDE)/sh/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh4uart.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh4uart.h + +$(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h: include/rtems/score/sh7750_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h + +$(PROJECT_INCLUDE)/rtems/score/ipl.h: include/rtems/score/ipl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ipl.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ipl.h + +$(PROJECT_INCLUDE)/rtems/score/iosh7750.h: include/rtems/score/iosh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7750.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7750.h + +$(PROJECT_INCLUDE)/rtems/score/ispsh7750.h: include/rtems/score/ispsh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h + +$(PROJECT_INCLUDE)/rtems/score/sh4_regs.h: include/rtems/score/sh4_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h + include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3