summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-09-05 16:01:20 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-09-05 16:01:20 +0000
commit7577f266583c302ad43c3454e161af6045fdc1ba (patch)
tree5cfc979bf18b208f28b010533d9f9353d2dfb068
parent2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-7577f266583c302ad43c3454e161af6045fdc1ba.tar.bz2
2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Include compile.am
-rw-r--r--c/src/lib/libcpu/i386/ChangeLog4
-rw-r--r--c/src/lib/libcpu/i386/Makefile.am8
2 files changed, 9 insertions, 3 deletions
diff --git a/c/src/lib/libcpu/i386/ChangeLog b/c/src/lib/libcpu/i386/ChangeLog
index 101734ce64..98b55ac314 100644
--- a/c/src/lib/libcpu/i386/ChangeLog
+++ b/c/src/lib/libcpu/i386/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Include compile.am
+
2000-08-10 Joel Sherrill <joel@OARcorp.com>
* ChangeLog: New file.
diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am
index 361711a181..778e23c8fb 100644
--- a/c/src/lib/libcpu/i386/Makefile.am
+++ b/c/src/lib/libcpu/i386/Makefile.am
@@ -7,7 +7,8 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
VPATH = @srcdir@:@srcdir@/../shared/src
-C_FILES = cache.c cache_aligned_malloc.c cache_manager.c displayCpu.c idt.c page.c
+C_FILES = cache.c cache_aligned_malloc.c cache_manager.c displayCpu.c idt.c \
+ page.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
H_FILES = cache_.h
@@ -19,6 +20,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
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
AM_CPPFLAGS += -I$(srcdir)
@@ -38,7 +40,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS)
-EXTRA_DIST = cache.c cache_.h cpu.h cpuModel.S cpuModel.h \
- displayCpu.c idt.c idtr.S page.c registers.h
+EXTRA_DIST = cache.c cache_.h cpu.h cpuModel.S cpuModel.h displayCpu.c idt.c \
+ idtr.S page.c registers.h
include $(top_srcdir)/../../../../../automake/local.am