From 7c9a5989c8eab778b7d32a3972fde59d0fba7312 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 7 Nov 2002 22:28:18 +0000 Subject: 2002-11-07 Ralf Corsepius * Makefile.am: Merge in include/Makefile.am. * include/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libcpu/sh/sh7032/ChangeLog | 6 +++++ c/src/lib/libcpu/sh/sh7032/Makefile.am | 25 +++++++++++++++++- c/src/lib/libcpu/sh/sh7032/configure.ac | 1 - c/src/lib/libcpu/sh/sh7032/include/Makefile.am | 29 --------------------- c/src/lib/libcpu/sh/sh7045/ChangeLog | 6 +++++ c/src/lib/libcpu/sh/sh7045/Makefile.am | 26 ++++++++++++++++++- c/src/lib/libcpu/sh/sh7045/include/Makefile.am | 31 ---------------------- c/src/lib/libcpu/sh/sh7750/ChangeLog | 6 +++++ c/src/lib/libcpu/sh/sh7750/Makefile.am | 32 ++++++++++++++++++++++- c/src/lib/libcpu/sh/sh7750/configure.ac | 1 - c/src/lib/libcpu/sh/sh7750/include/Makefile.am | 36 -------------------------- 11 files changed, 98 insertions(+), 101 deletions(-) delete mode 100644 c/src/lib/libcpu/sh/sh7032/include/Makefile.am delete mode 100644 c/src/lib/libcpu/sh/sh7045/include/Makefile.am delete mode 100644 c/src/lib/libcpu/sh/sh7750/include/Makefile.am (limited to 'c') diff --git a/c/src/lib/libcpu/sh/sh7032/ChangeLog b/c/src/lib/libcpu/sh/sh7032/ChangeLog index da13bb5dc9..8155f78fab 100644 --- a/c/src/lib/libcpu/sh/sh7032/ChangeLog +++ b/c/src/lib/libcpu/sh/sh7032/ChangeLog @@ -1,3 +1,9 @@ +2002-11-07 Ralf Corsepius + + * Makefile.am: Merge in include/Makefile.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2002-11-01 Joel Sherrill * delay/delay.c, score/ispsh7032.c: Removed warnings. diff --git a/c/src/lib/libcpu/sh/sh7032/Makefile.am b/c/src/lib/libcpu/sh/sh7032/Makefile.am index d22670b5e7..78dd4408ca 100644 --- a/c/src/lib/libcpu/sh/sh7032/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/Makefile.am @@ -4,7 +4,30 @@ ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = include score clock timer sci delay +SUBDIRS = . score clock timer sci delay + +# NOTE: Unlike other CPUS, we install into a subdirectory to avoid +# file name conflicts +include_shdir = $(includedir)/sh +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/%.h: include/%.h + $(INSTALL_DATA) $< $@ + +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/sh \ + $(include_sh_HEADERS:include/%.h=$(PROJECT_INCLUDE)/sh/%.h) \ + $(include_rtems_score_HEADERS:include/%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) + +all-local: $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7032/configure.ac b/c/src/lib/libcpu/sh/sh7032/configure.ac index 8f0a422c3a..e5e10d0b28 100644 --- a/c/src/lib/libcpu/sh/sh7032/configure.ac +++ b/c/src/lib/libcpu/sh/sh7032/configure.ac @@ -31,7 +31,6 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) AC_CONFIG_FILES([Makefile clock/Makefile delay/Makefile -include/Makefile score/Makefile timer/Makefile sci/Makefile]) diff --git a/c/src/lib/libcpu/sh/sh7032/include/Makefile.am b/c/src/lib/libcpu/sh/sh7032/include/Makefile.am deleted file mode 100644 index d5d3bc1c79..0000000000 --- a/c/src/lib/libcpu/sh/sh7032/include/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -## -## $Id$ -## - - -# NOTE: Unlike other CPUS, we install into a subdirectory to avoid -# file name conflicts -include_shdir = $(includedir)/sh -include_rtems_scoredir = $(includedir)/rtems/score - -include_sh_HEADERS = sci.h sh7_pfc.h sh7_sci.h -include_rtems_score_HEADERS = ispsh7032.h iosh7032.h - -$(PROJECT_INCLUDE)/sh: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/sh/%.h: %.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/rtems/score/%.h: %.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(PROJECT_INCLUDE)/sh \ - $(include_sh_HEADERS:%=$(PROJECT_INCLUDE)/sh/%) \ - $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%) - -all-local: $(TMPINSTALL_FILES) - -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 3cc58b2370..6c89084555 100644 --- a/c/src/lib/libcpu/sh/sh7045/ChangeLog +++ b/c/src/lib/libcpu/sh/sh7045/ChangeLog @@ -1,3 +1,9 @@ +2002-11-07 Ralf Corsepius + + * Makefile.am: Merge in include/Makefile.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2002-11-01 Joel Sherrill * score/cpu_asm.c, score/ispsh7045.c: Removed warnings. diff --git a/c/src/lib/libcpu/sh/sh7045/Makefile.am b/c/src/lib/libcpu/sh/sh7045/Makefile.am index df317d5069..89e57442d7 100644 --- a/c/src/lib/libcpu/sh/sh7045/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/Makefile.am @@ -4,7 +4,31 @@ ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = include score clock sci timer +SUBDIRS = . score clock sci timer + +# NOTE: Unlike other CPUS, we install into a subdirectory to avoid +# file name conflicts +include_shdir = $(includedir)/sh +include_rtems_scoredir = $(includedir)/rtems/score + +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/%.h: include/%.h + $(INSTALL_DATA) $< $@ + +TMPINSTALL_FILES = $(PROJECT_INCLUDE)/sh \ + $(include_sh_HEADERS:include/%=$(PROJECT_INCLUDE)/sh/%) \ + $(include_rtems_score_HEADERS:include/%=$(PROJECT_INCLUDE)/rtems/score/%) + +all-local: $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/include/Makefile.am b/c/src/lib/libcpu/sh/sh7045/include/Makefile.am deleted file mode 100644 index 4e000e1315..0000000000 --- a/c/src/lib/libcpu/sh/sh7045/include/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## -## $Id$ -## - - -# NOTE: Unlike other CPUS, we install into a subdirectory to avoid -# file name conflicts -include_shdir = $(includedir)/sh -include_rtems_scoredir = $(includedir)/rtems/score - -include_sh_HEADERS = io_types.h sci.h sh7_pfc.h sh7_sci.h sci_termios.h -include_rtems_score_HEADERS = ispsh7045.h iosh7045.h - -$(PROJECT_INCLUDE)/sh: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/sh/%.h: %.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/rtems/score/%.h: %.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(PROJECT_INCLUDE)/sh \ - $(include_sh_HEADERS:%=$(PROJECT_INCLUDE)/sh/%) \ - $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%) - -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = io_types.h sci.h sh7_pfc.h sh7_sci.h sci_termios.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 d5358f9388..0f6cd01d80 100644 --- a/c/src/lib/libcpu/sh/sh7750/ChangeLog +++ b/c/src/lib/libcpu/sh/sh7750/ChangeLog @@ -1,3 +1,9 @@ +2002-11-07 Ralf Corsepius + + * Makefile.am: Merge in include/Makefile.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2002-11-01 Joel Sherrill * score/cpu_asm.c, score/ispsh7750.c: Removed warnings. diff --git a/c/src/lib/libcpu/sh/sh7750/Makefile.am b/c/src/lib/libcpu/sh/sh7750/Makefile.am index df317d5069..8c8409eea9 100644 --- a/c/src/lib/libcpu/sh/sh7750/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7750/Makefile.am @@ -4,7 +4,37 @@ ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = include score clock sci timer +SUBDIRS = . score clock sci timer + +# NOTE: Unlike other CPUS, we install into a subdirectory to avoid +# file name conflicts +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) $< $@ + +TMPINSTALL_FILES = \ + $(PROJECT_INCLUDE)/sh \ + $(include_sh_HEADERS:include/%=$(PROJECT_INCLUDE)/%) \ + $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:include/%=$(PROJECT_INCLUDE)/%) + +all-local: $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7750/configure.ac b/c/src/lib/libcpu/sh/sh7750/configure.ac index c26fab38e2..f2212a6a58 100644 --- a/c/src/lib/libcpu/sh/sh7750/configure.ac +++ b/c/src/lib/libcpu/sh/sh7750/configure.ac @@ -30,7 +30,6 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile clock/Makefile -include/Makefile score/Makefile sci/Makefile timer/Makefile]) diff --git a/c/src/lib/libcpu/sh/sh7750/include/Makefile.am b/c/src/lib/libcpu/sh/sh7750/include/Makefile.am deleted file mode 100644 index 3c25d9931a..0000000000 --- a/c/src/lib/libcpu/sh/sh7750/include/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -## -## $Id$ -## - - -# NOTE: Unlike other CPUS, we install into a subdirectory to avoid -# file name conflicts -include_shdir = $(includedir)/sh -include_rtems_scoredir = $(includedir)/rtems/score - -include_sh_HEADERS = sh/sh4uart.h -include_rtems_score_HEADERS = \ -rtems/score/sh7750_regs.h \ -rtems/score/ipl.h \ -rtems/score/iosh7750.h \ -rtems/score/ispsh7750.h \ -rtems/score/sh4_regs.h - -$(PROJECT_INCLUDE)/sh: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/rtems/score: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = \ - $(PROJECT_INCLUDE)/sh \ - $(include_sh_HEADERS:%=$(PROJECT_INCLUDE)/%) \ - $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../../../automake/local.am -- cgit v1.2.3