diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-20 03:03:28 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-20 03:03:28 +0000 |
| commit | d8a2c36f9c1c36d8a8893da1017042eae793339e (patch) | |
| tree | 84c2ffcc6986a1b54ac5041a4aa05a118bdaa835 /c | |
| parent | 2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-d8a2c36f9c1c36d8a8893da1017042eae793339e.tar.bz2 | |
2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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/mvme162/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/configure.ac | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am | 11 |
3 files changed, 13 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog index ac5493f356..47dfa81624 100644 --- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog @@ -1,3 +1,8 @@ +2004-01-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * 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/mvme162/configure.ac b/c/src/lib/libbsp/m68k/mvme162/configure.ac index 86cca0238e..5c77e9252a 100644 --- a/c/src/lib/libbsp/m68k/mvme162/configure.ac +++ b/c/src/lib/libbsp/m68k/mvme162/configure.ac @@ -19,6 +19,7 @@ RTEMS_CHECK_NETWORKING RTEMS_CONFIG_BUILD_SUBDIRS(tools) 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/mvme162/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am index 7e962df43a..c84f3276b0 100644 --- a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am @@ -11,10 +11,13 @@ BSP_PIECES = startup clock console timer tod $(NETWORKING_DRIVER) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../consolex/$(ARCH)/consolex.rel) $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) + $(wildcard ../consolex/$(ARCH)/consolex.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 |