Merge-in sh7045/Makefile.am.

1 files changed, 43 insertions, 6 deletions

diff --git a/c/src/lib/libcpu/sh/Makefile.am b/c/src/lib/libcpu/sh/Makefile.am
index 537e6ed3d6..165187ff52 100644
--- a/c/src/lib/libcpu/sh/Makefile.am
+++ b/c/src/lib/libcpu/sh/Makefile.am
@@ -10,7 +10,7 @@ CLEANFILES =
 DISTCLEANFILES =
 noinst_PROGRAMS =
 
-SUBDIRS = sh7045 sh7750
+SUBDIRS = sh7750
 
 if sh7032
 # NOTE: Unlike other CPUS, we install into a subdirectory to avoid
@@ -21,36 +21,73 @@ include_rtems_scoredir = $(includedir)/rtems/score
 include_sh_HEADERS = sh7032/include/sci.h sh7032/include/sh7_pfc.h sh7032/include/sh7_sci.h
 include_rtems_score_HEADERS = sh7032/include/ispsh7032.h sh7032/include/iosh7032.h
 
-# clock
+## sh7032/clock
 noinst_PROGRAMS += sh7032/clock.rel
 sh7032_clock_rel_SOURCES = sh7032/clock/ckinit.c
 sh7032_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
 sh7032_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-# delay
+## sh7032/delay
 noinst_PROGRAMS += sh7032/delay.rel
 sh7032_delay_rel_SOURCES = sh7032/delay/delay.c
 sh7032_delay_rel_CPPFLAGS = $(AM_CPPFLAGS)
 sh7032_delay_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-# sci
+## sh7032/sci
 noinst_PROGRAMS += sh7032/sci.rel
 sh7032_sci_rel_SOURCES = sh7032/sci/sci.c
 sh7032_sci_rel_CPPFLAGS = $(AM_CPPFLAGS)
 sh7032_sci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-# score
+## sh7032/score
 noinst_PROGRAMS += sh7032/score.rel
 sh7032_score_rel_SOURCES = sh7032/score/cpu_asm.c sh7032/score/ispsh7032.c
 sh7032_score_rel_CPPFLAGS = $(AM_CPPFLAGS)
 sh7032_score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-## timer
+### sh7032/timer
 noinst_PROGRAMS += sh7032/timer.rel
 sh7032_timer_rel_SOURCES = sh7032/timer/timer.c
 sh7032_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
 sh7032_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
+if sh7045
+# 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 = sh7045/include/io_types.h sh7045/include/sci.h sh7045/include/sh7_pfc.h \
+    sh7045/include/sh7_sci.h sh7045/include/sci_termios.h
+include_rtems_score_HEADERS = sh7045/include/ispsh7045.h sh7045/include/iosh7045.h
+
+## sh7045/clock
+noinst_PROGRAMS += sh7045/clock.rel
+sh7045_clock_rel_SOURCES = sh7045/clock/ckinit.c
+sh7045_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
+sh7045_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+## sh7045/sci
+noinst_PROGRAMS += sh7045/sci.rel
+sh7045_sci_rel_SOURCES = sh7045/sci/sci.c sh7045/sci/sci_termios.c
+sh7045_sci_rel_CPPFLAGS = $(AM_CPPFLAGS)
+sh7045_sci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+## sh7045/score
+noinst_PROGRAMS += sh7045/score.rel
+sh7045_score_rel_SOURCES = sh7045/score/cpu_asm.c sh7045/score/ispsh7045.c
+sh7045_score_rel_CPPFLAGS = $(AM_CPPFLAGS)
+sh7045_score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+### sh7045/timer
+noinst_PROGRAMS += sh7045/timer.rel
+sh7045_timer_rel_SOURCES = sh7045/timer/timer.c
+sh7045_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
+sh7045_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+endif
+
+include $(srcdir)/preinstall.am
+
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am