From 70810dcd8970194d96f685ffe4af890911e273c5 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 8 Feb 2000 22:33:25 +0000 Subject: Patches rtems-rc-20000204-0.diff from Ralf Corsepius 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) --- c/src/lib/libcpu/a29k/clock/Makefile.am | 2 +- c/src/lib/libcpu/a29k/configure.in | 4 +--- c/src/lib/libcpu/a29k/timer/Makefile.am | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'c/src/lib/libcpu/a29k') 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 -- cgit v1.2.3