From b55e727e6d4e7452a1e858801d9dbc803429b2c5 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Jan 2004 06:42:49 +0000 Subject: 2003-01-21 Ralf Corsepius * Makefile.am: Unconditionally build subdirs sh7032, sh7045, sh7750. * configure.ac: Merge-in sh7032/configure.ac, sh7045/configure.ac, sh7750/configure.ac. Add AM_CONDITIONALS sh7032, sh7045, sh7750. * sh7032/Makefile.am, sh7045/Makefile.am, sh7750/Makefile.am: Reflect changes above. Add PREINSTALL_DIRS. * sh7032/configure.ac, sh7045/configure.ac, sh7750/configure.ac: Remove. * sh7032/.cvsignore, sh7045/.cvsignore, sh7750/.cvsignore: Reflect changes above. --- c/src/lib/libcpu/sh/ChangeLog | 13 +++++++++++++ c/src/lib/libcpu/sh/Makefile.am | 2 +- c/src/lib/libcpu/sh/configure.ac | 23 ++++++++++++++--------- c/src/lib/libcpu/sh/sh7032/.cvsignore | 12 ------------ c/src/lib/libcpu/sh/sh7032/Makefile.am | 18 +++++++++++------- c/src/lib/libcpu/sh/sh7032/configure.ac | 28 ---------------------------- c/src/lib/libcpu/sh/sh7045/.cvsignore | 12 ------------ c/src/lib/libcpu/sh/sh7045/Makefile.am | 20 +++++++++++++------- c/src/lib/libcpu/sh/sh7045/configure.ac | 28 ---------------------------- c/src/lib/libcpu/sh/sh7750/.cvsignore | 12 ------------ c/src/lib/libcpu/sh/sh7750/Makefile.am | 20 ++++++++++++-------- c/src/lib/libcpu/sh/sh7750/configure.ac | 28 ---------------------------- 12 files changed, 64 insertions(+), 152 deletions(-) delete mode 100644 c/src/lib/libcpu/sh/sh7032/configure.ac delete mode 100644 c/src/lib/libcpu/sh/sh7045/configure.ac delete mode 100644 c/src/lib/libcpu/sh/sh7750/configure.ac (limited to 'c') diff --git a/c/src/lib/libcpu/sh/ChangeLog b/c/src/lib/libcpu/sh/ChangeLog index b54c1d6121..a452badc68 100644 --- a/c/src/lib/libcpu/sh/ChangeLog +++ b/c/src/lib/libcpu/sh/ChangeLog @@ -1,3 +1,16 @@ +2003-01-21 Ralf Corsepius + + * Makefile.am: Unconditionally build subdirs sh7032, sh7045, sh7750. + * configure.ac: Merge-in sh7032/configure.ac, sh7045/configure.ac, + sh7750/configure.ac. + Add AM_CONDITIONALS sh7032, sh7045, sh7750. + * sh7032/Makefile.am, sh7045/Makefile.am, sh7750/Makefile.am: + Reflect changes above. Add PREINSTALL_DIRS. + * sh7032/configure.ac, sh7045/configure.ac, sh7750/configure.ac: + Remove. + * sh7032/.cvsignore, sh7045/.cvsignore, sh7750/.cvsignore: + Reflect changes above. + 2003-12-12 Ralf Corsepius * configure.ac: Require automake >= 1.8, autoconf >= 2.59. diff --git a/c/src/lib/libcpu/sh/Makefile.am b/c/src/lib/libcpu/sh/Makefile.am index 16eaf71fab..4ed659a5c4 100644 --- a/c/src/lib/libcpu/sh/Makefile.am +++ b/c/src/lib/libcpu/sh/Makefile.am @@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal -SUBDIRS = @subdirs@ +SUBDIRS = sh7032 sh7045 sh7750 include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/configure.ac b/c/src/lib/libcpu/sh/configure.ac index 0d036ed05f..3af95e5427 100644 --- a/c/src/lib/libcpu/sh/configure.ac +++ b/c/src/lib/libcpu/sh/configure.ac @@ -9,24 +9,29 @@ RTEMS_TOP(../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define foreign 1.8]) +AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8.2]) AM_MAINTAINER_MODE RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP - RTEMS_PROJECT_ROOT +RTEMS_PROG_CC_FOR_TARGET +AM_PROG_CC_C_O +RTEMS_CANONICALIZE_TOOLS +RTEMS_PROG_CCAS + RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -case "$RTEMS_CPU_MODEL" in -sh7032 ) AC_CONFIG_SUBDIRS([sh7032]);; -sh7045 ) AC_CONFIG_SUBDIRS([sh7045]);; -sh7750 ) AC_CONFIG_SUBDIRS([sh7750]);; -*) AC_MSG_ERROR([Invalid RTEMS_CPU_MODEL]); -esac +AM_CONDITIONAL([sh7032],[test x"$RTEMS_CPU_MODEL" = x"sh7032"]) +AM_CONDITIONAL([sh7045],[test x"$RTEMS_CPU_MODEL" = x"sh7045"]) +AM_CONDITIONAL([sh7750],[test x"$RTEMS_CPU_MODEL" = x"sh7750"]) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile +sh7032/Makefile +sh7045/Makefile +sh7750/Makefile +]) AC_OUTPUT diff --git a/c/src/lib/libcpu/sh/sh7032/.cvsignore b/c/src/lib/libcpu/sh/sh7032/.cvsignore index bfdfd995be..282522db03 100644 --- a/c/src/lib/libcpu/sh/sh7032/.cvsignore +++ b/c/src/lib/libcpu/sh/sh7032/.cvsignore @@ -1,14 +1,2 @@ -aclocal.m4 -autom4te*.cache -config.cache -config.guess -config.log -config.status -config.sub -configure -depcomp -install-sh Makefile Makefile.in -missing -mkinstalldirs diff --git a/c/src/lib/libcpu/sh/sh7032/Makefile.am b/c/src/lib/libcpu/sh/sh7032/Makefile.am index af7ab5de95..83c078c97c 100644 --- a/c/src/lib/libcpu/sh/sh7032/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/Makefile.am @@ -2,15 +2,14 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../../../../aclocal - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am +include $(top_srcdir)/../../../automake/compile.am +include $(top_srcdir)/../../../automake/lib.am CLEANFILES = EXTRA_PROGRAMS = noinst_DATA = +if sh7032 # NOTE: Unlike other CPUS, we install into a subdirectory to avoid # file name conflicts include_shdir = $(includedir)/sh @@ -93,20 +92,23 @@ timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) noinst_DATA += timer$(LIB_VARIANT).rel +endif all-local: $(PREINSTALL_FILES) +PREINSTALL_DIRS = PREINSTALL_FILES = +if sh7032 $(PROJECT_INCLUDE)/sh/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/sh @: > $(PROJECT_INCLUDE)/sh/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp) $(PROJECT_INCLUDE)/rtems/score/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(PROJECT_INCLUDE)/sh/sci.h: include/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h @@ -127,7 +129,9 @@ 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 +endif CLEANFILES += $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) -include $(top_srcdir)/../../../../automake/local.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 deleted file mode 100644 index 434a1fba22..0000000000 --- a/c/src/lib/libcpu/sh/sh7032/configure.ac +++ /dev/null @@ -1,28 +0,0 @@ -## Process this file with autoconf to produce a configure script. -## -## $Id$ - -AC_PREREQ(2.59) -AC_INIT([rtems-c-src-lib-libcpu-sh-sh7032],[_RTEMS_VERSION],[rtems-bugs@rtems.com]) -AC_CONFIG_SRCDIR([include]) -RTEMS_TOP(../../../../../..) - -RTEMS_CANONICAL_TARGET_CPU - -AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8.2]) -AM_MAINTAINER_MODE - -RTEMS_ENABLE_BARE -RTEMS_ENV_RTEMSBSP - -RTEMS_PROJECT_ROOT - -RTEMS_PROG_CC_FOR_TARGET -AM_PROG_CC_C_O -RTEMS_CANONICALIZE_TOOLS - -RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/c/src/lib/libcpu/sh/sh7045/.cvsignore b/c/src/lib/libcpu/sh/sh7045/.cvsignore index bfdfd995be..282522db03 100644 --- a/c/src/lib/libcpu/sh/sh7045/.cvsignore +++ b/c/src/lib/libcpu/sh/sh7045/.cvsignore @@ -1,14 +1,2 @@ -aclocal.m4 -autom4te*.cache -config.cache -config.guess -config.log -config.status -config.sub -configure -depcomp -install-sh Makefile Makefile.in -missing -mkinstalldirs diff --git a/c/src/lib/libcpu/sh/sh7045/Makefile.am b/c/src/lib/libcpu/sh/sh7045/Makefile.am index 7bcb1d200a..021cd61af6 100644 --- a/c/src/lib/libcpu/sh/sh7045/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/Makefile.am @@ -2,15 +2,14 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../../../../aclocal - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am +include $(top_srcdir)/../../../automake/compile.am +include $(top_srcdir)/../../../automake/lib.am CLEANFILES = EXTRA_PROGRAMS = noinst_DATA = +if sh7045 # NOTE: Unlike other CPUS, we install into a subdirectory to avoid # file name conflicts include_shdir = $(includedir)/sh @@ -79,18 +78,23 @@ timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) noinst_DATA += timer$(LIB_VARIANT).rel +endif + +all-local: $(PREINSTALL_FILES) +PREINSTALL_DIRS = PREINSTALL_FILES = +if sh7045 $(PROJECT_INCLUDE)/sh/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/sh @: > $(PROJECT_INCLUDE)/sh/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp) $(PROJECT_INCLUDE)/rtems/score/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) +PREINSTALL_DIRS += $(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 @@ -119,7 +123,9 @@ 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 +endif CLEANFILES += $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/configure.ac b/c/src/lib/libcpu/sh/sh7045/configure.ac deleted file mode 100644 index 8b015ead48..0000000000 --- a/c/src/lib/libcpu/sh/sh7045/configure.ac +++ /dev/null @@ -1,28 +0,0 @@ -## Process this file with autoconf to produce a configure script. -## -## $Id$ - -AC_PREREQ(2.59) -AC_INIT([rtems-c-src-lib-libcpu-sh-sh7045],[_RTEMS_VERSION],[rtems-bugs@rtems.com]) -AC_CONFIG_SRCDIR([include]) -RTEMS_TOP(../../../../../..) - -RTEMS_CANONICAL_TARGET_CPU - -AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8.2]) -AM_MAINTAINER_MODE - -RTEMS_ENABLE_BARE -RTEMS_ENV_RTEMSBSP - -RTEMS_PROJECT_ROOT - -RTEMS_PROG_CC_FOR_TARGET -AM_PROG_CC_C_O -RTEMS_CANONICALIZE_TOOLS - -RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/c/src/lib/libcpu/sh/sh7750/.cvsignore b/c/src/lib/libcpu/sh/sh7750/.cvsignore index bfdfd995be..282522db03 100644 --- a/c/src/lib/libcpu/sh/sh7750/.cvsignore +++ b/c/src/lib/libcpu/sh/sh7750/.cvsignore @@ -1,14 +1,2 @@ -aclocal.m4 -autom4te*.cache -config.cache -config.guess -config.log -config.status -config.sub -configure -depcomp -install-sh Makefile Makefile.in -missing -mkinstalldirs diff --git a/c/src/lib/libcpu/sh/sh7750/Makefile.am b/c/src/lib/libcpu/sh/sh7750/Makefile.am index 2314f70f21..76e39e815f 100644 --- a/c/src/lib/libcpu/sh/sh7750/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7750/Makefile.am @@ -2,15 +2,14 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../../../../aclocal - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am +include $(top_srcdir)/../../../automake/compile.am +include $(top_srcdir)/../../../automake/lib.am CLEANFILES = EXTRA_PROGRAMS = noinst_DATA = +if sh7750 # NOTE: Unlike other CPUS, we install into a subdirectory to avoid # file name conflicts include_shdir = $(includedir)/sh @@ -80,22 +79,25 @@ timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) noinst_DATA += timer$(LIB_VARIANT).rel +endif -# -- +## -- all-local: $(PREINSTALL_FILES) +PREINSTALL_DIRS = PREINSTALL_FILES = +if sh7750 $(PROJECT_INCLUDE)/sh/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/sh @: > $(PROJECT_INCLUDE)/sh/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp) $(PROJECT_INCLUDE)/rtems/score/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) +PREINSTALL_DIRS += $(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 @@ -120,7 +122,9 @@ 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 +endif CLEANFILES += $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) -include $(top_srcdir)/../../../../automake/local.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 deleted file mode 100644 index ee185d654c..0000000000 --- a/c/src/lib/libcpu/sh/sh7750/configure.ac +++ /dev/null @@ -1,28 +0,0 @@ -## Process this file with autoconf to produce a configure script. -## -## $Id$ - -AC_PREREQ(2.59) -AC_INIT([rtems-c-src-lib-libcpu-sh-sh7750],[_RTEMS_VERSION],[rtems-bugs@rtems.com]) -AC_CONFIG_SRCDIR([include]) -RTEMS_TOP(../../../../../..) - -RTEMS_CANONICAL_TARGET_CPU - -AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8.2]) -AM_MAINTAINER_MODE - -RTEMS_ENABLE_BARE -RTEMS_ENV_RTEMSBSP - -RTEMS_PROJECT_ROOT - -RTEMS_PROG_CC_FOR_TARGET -AM_PROG_CC_C_O -RTEMS_CANONICALIZE_TOOLS - -RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT -- cgit v1.2.3