diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-20 03:03:04 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-20 03:03:04 +0000 |
| commit | b04a2b3c2007a2d8338dd5f84f766f1d60ab7369 (patch) | |
| tree | f06e24402633d525f9eb9fbc4281d92a18d78f6c /c | |
| parent | 2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-b04a2b3c2007a2d8338dd5f84f766f1d60ab7369.tar.bz2 | |
2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Remove non-existing file "times" from EXTRA_DIST.
* configure.ac: Add AM_CONDITIONAL(HAS_FPSP).
* wrapup/Makefile.am: Reflect changes to libcpu.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/Makefile.am | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/configure.ac | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am | 10 |
4 files changed, 13 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index e8b7b8b282..41694516e3 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog @@ -1,3 +1,9 @@ +2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Remove non-existing file "times" from EXTRA_DIST. + * configure.ac: Add AM_CONDITIONAL(HAS_FPSP). + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am index 612c6f4de0..47424a923d 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am @@ -13,8 +13,6 @@ SUBDIRS = . startup clock console timer network wrapup include_HEADERS += include/coverhd.h -EXTRA_DIST = times - S_FILES = start/start.S $(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp) $(CCASCOMPILE) -DASM -o $@ -c $< diff --git a/c/src/lib/libbsp/m68k/gen68360/configure.ac b/c/src/lib/libbsp/m68k/gen68360/configure.ac index b2d498ea1f..4660b2bbdc 100644 --- a/c/src/lib/libbsp/m68k/gen68360/configure.ac +++ b/c/src/lib/libbsp/m68k/gen68360/configure.ac @@ -17,6 +17,7 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +AM_CONDITIONAL(HAS_FPSP,[test "$RTEMS_CPU_MODEL" = "m68040"]) # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile diff --git a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am index 53d688d346..64d50bc770 100644 --- a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am @@ -11,10 +11,12 @@ BSP_PIECES = startup clock console timer $(NETWORKING_DRIVER) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) + ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel + +if HAS_FPSP +OBJS += ../../../../libcpu/m68k/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel +endif include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am |