summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libcpu
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-12-19 04:59:01 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-12-19 04:59:01 +0000
commita914e3f747ce7349ab93025b1538323b2bcae188 (patch)
tree171e99c5ed849c286658f336bbfff30764e02f2a /c/src/lib/libcpu
parentInclude netinet sources. (diff)
downloadrtems-a914e3f747ce7349ab93025b1538323b2bcae188.tar.bz2
2002-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Don't include @RTEMS_BSP@.cfg. Eliminate *_O_FILES. * configure.ac: Remove RTEMS_CHECK_CUSTOM_BSP.
Diffstat (limited to 'c/src/lib/libcpu')
-rw-r--r--c/src/lib/libcpu/i386/ChangeLog6
-rw-r--r--c/src/lib/libcpu/i386/Makefile.am7
-rw-r--r--c/src/lib/libcpu/i386/configure.ac2
3 files changed, 8 insertions, 7 deletions
diff --git a/c/src/lib/libcpu/i386/ChangeLog b/c/src/lib/libcpu/i386/ChangeLog
index d128420021..207dec2b2a 100644
--- a/c/src/lib/libcpu/i386/ChangeLog
+++ b/c/src/lib/libcpu/i386/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Don't include @RTEMS_BSP@.cfg.
+ Eliminate *_O_FILES.
+ * configure.ac: Remove RTEMS_CHECK_CUSTOM_BSP.
+
2002-12-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove RTEMS_CHECK_BSP_CACHE.
diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am
index 901e244f1c..bf8fb204ea 100644
--- a/c/src/lib/libcpu/i386/Makefile.am
+++ b/c/src/lib/libcpu/i386/Makefile.am
@@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../../../../aclocal
VPATH = @srcdir@:@srcdir@/../shared/src
C_FILES = cache.c cache_aligned_malloc.c cache_manager.c displayCpu.c page.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include_libcpudir = $(includedir)/libcpu
@@ -15,11 +15,8 @@ noinst_HEADERS = cache_.h
include_libcpu_HEADERS = cpu.h cpuModel.h cache.h
S_FILES = cpuModel.S idtr.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
-OBJS = $(C_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../../automake/compile.am
include $(top_srcdir)/../../../../../automake/lib.am
diff --git a/c/src/lib/libcpu/i386/configure.ac b/c/src/lib/libcpu/i386/configure.ac
index 30eaff7d41..7077d49db1 100644
--- a/c/src/lib/libcpu/i386/configure.ac
+++ b/c/src/lib/libcpu/i386/configure.ac
@@ -25,8 +25,6 @@ RTEMS_PROG_CC_FOR_TARGET
RTEMS_CANONICALIZE_TOOLS
RTEMS_PROG_CCAS
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile])
AC_OUTPUT