Changeset b55e727 in rtems


Ignore:
Timestamp:
Jan 21, 2004, 6:42:49 AM (17 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
63ae876
Parents:
41df507e
Message:

2003-01-21 Ralf Corsepius <corsepiu@…>

  • 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.
Location:
c/src/lib/libcpu/sh
Files:
3 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libcpu/sh/ChangeLog

    r41df507e rb55e727  
     12003-01-21      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Unconditionally build subdirs sh7032, sh7045, sh7750.
     4        * configure.ac: Merge-in sh7032/configure.ac, sh7045/configure.ac,
     5        sh7750/configure.ac.
     6        Add AM_CONDITIONALS sh7032, sh7045, sh7750.
     7        * sh7032/Makefile.am, sh7045/Makefile.am, sh7750/Makefile.am:
     8        Reflect changes above. Add PREINSTALL_DIRS.
     9        * sh7032/configure.ac, sh7045/configure.ac, sh7750/configure.ac:
     10        Remove.
     11        * sh7032/.cvsignore, sh7045/.cvsignore, sh7750/.cvsignore:
     12        Reflect changes above.
     13
    1142003-12-12      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    215
  • c/src/lib/libcpu/sh/Makefile.am

    r41df507e rb55e727  
    55ACLOCAL_AMFLAGS = -I ../../../aclocal
    66
    7 SUBDIRS = @subdirs@
     7SUBDIRS = sh7032 sh7045 sh7750
    88
    99include $(top_srcdir)/../../../automake/subdirs.am
  • c/src/lib/libcpu/sh/configure.ac

    r41df507e rb55e727  
    1010RTEMS_CANONICAL_TARGET_CPU
    1111
    12 AM_INIT_AUTOMAKE([no-define foreign 1.8])
     12AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8.2])
    1313AM_MAINTAINER_MODE
    1414
     
    1616RTEMS_ENV_RTEMSBSP
    1717
     18RTEMS_PROJECT_ROOT
    1819
    19 RTEMS_PROJECT_ROOT
     20RTEMS_PROG_CC_FOR_TARGET
     21AM_PROG_CC_C_O
     22RTEMS_CANONICALIZE_TOOLS
     23RTEMS_PROG_CCAS
    2024
    2125RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    2226
    23 case "$RTEMS_CPU_MODEL" in
    24 sh7032 ) AC_CONFIG_SUBDIRS([sh7032]);;
    25 sh7045 ) AC_CONFIG_SUBDIRS([sh7045]);;
    26 sh7750 ) AC_CONFIG_SUBDIRS([sh7750]);;
    27 *) AC_MSG_ERROR([Invalid RTEMS_CPU_MODEL]);
    28 esac
     27AM_CONDITIONAL([sh7032],[test x"$RTEMS_CPU_MODEL" = x"sh7032"])
     28AM_CONDITIONAL([sh7045],[test x"$RTEMS_CPU_MODEL" = x"sh7045"])
     29AM_CONDITIONAL([sh7750],[test x"$RTEMS_CPU_MODEL" = x"sh7750"])
    2930
    3031# Explicitly list all Makefiles here
    31 AC_CONFIG_FILES([Makefile])
     32AC_CONFIG_FILES([Makefile
     33sh7032/Makefile
     34sh7045/Makefile
     35sh7750/Makefile
     36])
    3237AC_OUTPUT
  • c/src/lib/libcpu/sh/sh7032/.cvsignore

    r41df507e rb55e727  
    1 aclocal.m4
    2 autom4te*.cache
    3 config.cache
    4 config.guess
    5 config.log
    6 config.status
    7 config.sub
    8 configure
    9 depcomp
    10 install-sh
    111Makefile
    122Makefile.in
    13 missing
    14 mkinstalldirs
  • c/src/lib/libcpu/sh/sh7032/Makefile.am

    r41df507e rb55e727  
    33##
    44
    5 ACLOCAL_AMFLAGS = -I ../../../../aclocal
    6 
    7 include $(top_srcdir)/../../../../automake/compile.am
    8 include $(top_srcdir)/../../../../automake/lib.am
     5include $(top_srcdir)/../../../automake/compile.am
     6include $(top_srcdir)/../../../automake/lib.am
    97
    108CLEANFILES =
     
    1210noinst_DATA =
    1311
     12if sh7032
    1413# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
    1514#       file name conflicts
     
    9493
    9594noinst_DATA += timer$(LIB_VARIANT).rel
     95endif
    9696
    9797all-local: $(PREINSTALL_FILES)
    9898
     99PREINSTALL_DIRS =
    99100PREINSTALL_FILES =
    100101
     102if sh7032
    101103$(PROJECT_INCLUDE)/sh/$(dirstamp):
    102104        @$(mkdir_p) $(PROJECT_INCLUDE)/sh
    103105        @: > $(PROJECT_INCLUDE)/sh/$(dirstamp)
    104 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/$(dirstamp)
     106PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp)
    105107
    106108$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
    107109        @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score
    108110        @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    109 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     111PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    110112
    111113$(PROJECT_INCLUDE)/sh/sci.h: include/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
     
    128130        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7032.h
    129131PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7032.h
     132endif
    130133
    131134CLEANFILES += $(PREINSTALL_FILES)
     135DISTCLEANFILES = $(PREINSTALL_DIRS)
    132136
    133 include $(top_srcdir)/../../../../automake/local.am
     137include $(top_srcdir)/../../../automake/local.am
  • c/src/lib/libcpu/sh/sh7045/.cvsignore

    r41df507e rb55e727  
    1 aclocal.m4
    2 autom4te*.cache
    3 config.cache
    4 config.guess
    5 config.log
    6 config.status
    7 config.sub
    8 configure
    9 depcomp
    10 install-sh
    111Makefile
    122Makefile.in
    13 missing
    14 mkinstalldirs
  • c/src/lib/libcpu/sh/sh7045/Makefile.am

    r41df507e rb55e727  
    33##
    44
    5 ACLOCAL_AMFLAGS = -I ../../../../aclocal
    6 
    7 include $(top_srcdir)/../../../../automake/compile.am
    8 include $(top_srcdir)/../../../../automake/lib.am
     5include $(top_srcdir)/../../../automake/compile.am
     6include $(top_srcdir)/../../../automake/lib.am
    97
    108CLEANFILES =
     
    1210noinst_DATA =
    1311
     12if sh7045
    1413# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
    1514#       file name conflicts
     
    8079
    8180noinst_DATA += timer$(LIB_VARIANT).rel
     81endif
    8282
     83all-local: $(PREINSTALL_FILES)
     84
     85PREINSTALL_DIRS =
    8386PREINSTALL_FILES =
    8487
     88if sh7045
    8589$(PROJECT_INCLUDE)/sh/$(dirstamp):
    8690        @$(mkdir_p) $(PROJECT_INCLUDE)/sh
    8791        @: > $(PROJECT_INCLUDE)/sh/$(dirstamp)
    88 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/$(dirstamp)
     92PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp)
    8993
    9094$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
    9195        @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score
    9296        @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    93 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     97PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    9498
    9599$(PROJECT_INCLUDE)/sh/io_types.h: include/io_types.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
     
    120124        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7045.h
    121125PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7045.h
     126endif
    122127
    123128CLEANFILES += $(PREINSTALL_FILES)
     129DISTCLEANFILES = $(PREINSTALL_DIRS)
    124130
    125 include $(top_srcdir)/../../../../automake/local.am
     131include $(top_srcdir)/../../../automake/local.am
  • c/src/lib/libcpu/sh/sh7750/.cvsignore

    r41df507e rb55e727  
    1 aclocal.m4
    2 autom4te*.cache
    3 config.cache
    4 config.guess
    5 config.log
    6 config.status
    7 config.sub
    8 configure
    9 depcomp
    10 install-sh
    111Makefile
    122Makefile.in
    13 missing
    14 mkinstalldirs
  • c/src/lib/libcpu/sh/sh7750/Makefile.am

    r41df507e rb55e727  
    33##
    44
    5 ACLOCAL_AMFLAGS = -I ../../../../aclocal
    6 
    7 include $(top_srcdir)/../../../../automake/compile.am
    8 include $(top_srcdir)/../../../../automake/lib.am
     5include $(top_srcdir)/../../../automake/compile.am
     6include $(top_srcdir)/../../../automake/lib.am
    97
    108CLEANFILES =
     
    1210noinst_DATA =
    1311
     12if sh7750
    1413# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
    1514#       file name conflicts
     
    8180
    8281noinst_DATA += timer$(LIB_VARIANT).rel
     82endif
    8383
    84 # --
     84## --
    8585
    8686all-local: $(PREINSTALL_FILES)
    8787
     88PREINSTALL_DIRS =
    8889PREINSTALL_FILES =
    8990
     91if sh7750
    9092$(PROJECT_INCLUDE)/sh/$(dirstamp):
    9193        @$(mkdir_p) $(PROJECT_INCLUDE)/sh
    9294        @: > $(PROJECT_INCLUDE)/sh/$(dirstamp)
    93 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/$(dirstamp)
     95PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp)
    9496
    9597$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
    9698        @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score
    9799        @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    98 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     100PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    99101
    100102$(PROJECT_INCLUDE)/sh/sh4uart.h: include/sh/sh4uart.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
     
    121123        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h
    122124PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h
     125endif
    123126
    124127CLEANFILES += $(PREINSTALL_FILES)
     128DISTCLEANFILES = $(PREINSTALL_DIRS)
    125129
    126 include $(top_srcdir)/../../../../automake/local.am
     130include $(top_srcdir)/../../../automake/local.am
Note: See TracChangeset for help on using the changeset viewer.