diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-08 22:33:25 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-08 22:33:25 +0000 |
commit | 70810dcd8970194d96f685ffe4af890911e273c5 (patch) | |
tree | cade3ccf39b9bcabc04e7b1ce9105a83f80b177d /c/src/lib/libcpu | |
parent | changed version to 4.5.0-beta1 (diff) | |
download | rtems-70810dcd8970194d96f685ffe4af890911e273c5.tar.bz2 |
Patches rtems-rc-20000204-0.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
that contains:
* Removes remaining (now illegal) references to $(SRC) from a couple of
Makefile.ams
* Removes duplicate AC_CONFIG_SUBDIRS macro from c/configure.in
* Moves ENABLE_LIBCDIR into RTEMS_PROG_C[C|XX]_FOR_TARGET (hides LIBCDIR
from most configure scripts, i.e. LIBCDIR becomes less visible)
* Adds RTEMS_PROG_C[C|XX]_FOR_TARGET and RTEMS_CANONICALIZE_TOOLS to
libbsp/*/configure.ins (A minor bug in previous implementations, which
only has an impact when switching to GNU/Cygnus canonicalization)
* Cleans up several bogus comments.
* Removes MKLIB
* Switches the version number to 4.5.0 (for testing version number
handling)
Diffstat (limited to 'c/src/lib/libcpu')
-rw-r--r-- | c/src/lib/libcpu/a29k/clock/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/a29k/configure.in | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/a29k/timer/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/configure.in | 1 | ||||
-rw-r--r-- | c/src/lib/libcpu/hppa1.1/configure.in | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/i386/configure.in | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/m68k/configure.in | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/mips/configure.in | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/mips64orion/configure.in | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/powerpc/configure.in | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/sh/configure.in | 4 | ||||
-rw-r--r-- | c/src/lib/libcpu/sparc/configure.in | 4 |
12 files changed, 13 insertions, 30 deletions
diff --git a/c/src/lib/libcpu/a29k/clock/Makefile.am b/c/src/lib/libcpu/a29k/clock/Makefile.am index 12eab07673..00fc4bc7b8 100644 --- a/c/src/lib/libcpu/a29k/clock/Makefile.am +++ b/c/src/lib/libcpu/a29k/clock/Makefile.am @@ -23,7 +23,7 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -$(PGM): $(SRCS) $(OBJS) +$(PGM): $(OBJS) $(make-rel) all-local: $(ARCH) $(OBJS) $(PGM) diff --git a/c/src/lib/libcpu/a29k/configure.in b/c/src/lib/libcpu/a29k/configure.in index dabe68edb9..2b94c80000 100644 --- a/c/src/lib/libcpu/a29k/configure.in +++ b/c/src/lib/libcpu/a29k/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-a29k,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,13 +20,13 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile clock/Makefile diff --git a/c/src/lib/libcpu/a29k/timer/Makefile.am b/c/src/lib/libcpu/a29k/timer/Makefile.am index f17c802679..c87e702427 100644 --- a/c/src/lib/libcpu/a29k/timer/Makefile.am +++ b/c/src/lib/libcpu/a29k/timer/Makefile.am @@ -20,13 +20,13 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -$(PGM): $(SRCS) $(OBJS) +$(PGM): $(OBJS) $(make-rel) all-local: $(ARCH) $(OBJS) $(PGM) .PRECIOUS: $(PGM) -EXTRA_DIST = Makefile gettime.S timer.c timerisr.c +EXTRA_DIST = Makefile timer.c timerisr.c include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/configure.in b/c/src/lib/libcpu/configure.in index 715e517fe3..45d8af87c1 100644 --- a/c/src/lib/libcpu/configure.in +++ b/c/src/lib/libcpu/configure.in @@ -22,5 +22,6 @@ AC_SUBST(RTEMS_CPU_SUBDIR) AC_CONFIG_SUBDIRS($RTEMS_CPU_SUBDIR) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile) diff --git a/c/src/lib/libcpu/hppa1.1/configure.in b/c/src/lib/libcpu/hppa1.1/configure.in index d2c063b129..8459da6532 100644 --- a/c/src/lib/libcpu/hppa1.1/configure.in +++ b/c/src/lib/libcpu/hppa1.1/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-hppa1.1,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,13 +20,13 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile clock/Makefile diff --git a/c/src/lib/libcpu/i386/configure.in b/c/src/lib/libcpu/i386/configure.in index d01bc4a79a..b36f7e88f8 100644 --- a/c/src/lib/libcpu/i386/configure.in +++ b/c/src/lib/libcpu/i386/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-i386,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,13 +20,13 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile) diff --git a/c/src/lib/libcpu/m68k/configure.in b/c/src/lib/libcpu/m68k/configure.in index 7c54838139..efcd7c5b7e 100644 --- a/c/src/lib/libcpu/m68k/configure.in +++ b/c/src/lib/libcpu/m68k/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-m68k,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,7 +20,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -31,6 +28,7 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) AM_CONDITIONAL(m68040, test "$RTEMS_CPU_MODEL" = "m68040") +# Explicitly list all Makefiles here AC_OUTPUT( Makefile m68040/Makefile diff --git a/c/src/lib/libcpu/mips/configure.in b/c/src/lib/libcpu/mips/configure.in index c131f723ba..aed970845c 100644 --- a/c/src/lib/libcpu/mips/configure.in +++ b/c/src/lib/libcpu/mips/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-mips64orion,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,13 +20,13 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile clock/Makefile diff --git a/c/src/lib/libcpu/mips64orion/configure.in b/c/src/lib/libcpu/mips64orion/configure.in index c131f723ba..aed970845c 100644 --- a/c/src/lib/libcpu/mips64orion/configure.in +++ b/c/src/lib/libcpu/mips64orion/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-mips64orion,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,13 +20,13 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile clock/Makefile diff --git a/c/src/lib/libcpu/powerpc/configure.in b/c/src/lib/libcpu/powerpc/configure.in index 4f7be603d9..dfeed3d186 100644 --- a/c/src/lib/libcpu/powerpc/configure.in +++ b/c/src/lib/libcpu/powerpc/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-powerpc,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,7 +20,6 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS @@ -41,6 +38,7 @@ AM_CONDITIONAL(mpc821, test "$RTEMS_CPU_MODEL" = "mpc821") AM_CONDITIONAL(mpc860, test "$RTEMS_CPU_MODEL" = "mpc860") AM_CONDITIONAL(ppc403, test "$RTEMS_CPU_MODEL" = "ppc403") +# Explicitly list all Makefiles here AC_OUTPUT( Makefile mpc505/Makefile diff --git a/c/src/lib/libcpu/sh/configure.in b/c/src/lib/libcpu/sh/configure.in index 09eb21adb0..fbf6fbca9e 100644 --- a/c/src/lib/libcpu/sh/configure.in +++ b/c/src/lib/libcpu/sh/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-sh,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,13 +20,13 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile sh7032/Makefile diff --git a/c/src/lib/libcpu/sparc/configure.in b/c/src/lib/libcpu/sparc/configure.in index ce3265ff61..2cf51d9401 100644 --- a/c/src/lib/libcpu/sparc/configure.in +++ b/c/src/lib/libcpu/sparc/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-sparc,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_LIBCDIR - RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP @@ -22,13 +20,13 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -dnl check target cc RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) +# Explicitly list all Makefiles here AC_OUTPUT( Makefile reg_win/Makefile |