From 00e8978b1df6116bcfe6ba8972f3e22d9c20fe02 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 5 Sep 2000 16:01:00 +0000 Subject: 2000-09-04 Ralf Corsepius * m68040/fpsp/Makefile.am, shared/cache/Makefile.am: Include compile.am --- c/src/lib/libcpu/m68k/ChangeLog | 5 +++++ c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am | 1 + c/src/lib/libcpu/m68k/shared/cache/Makefile.am | 9 +++++---- 3 files changed, 11 insertions(+), 4 deletions(-) (limited to 'c') diff --git a/c/src/lib/libcpu/m68k/ChangeLog b/c/src/lib/libcpu/m68k/ChangeLog index 101734ce64..47f3c5dfc0 100644 --- a/c/src/lib/libcpu/m68k/ChangeLog +++ b/c/src/lib/libcpu/m68k/ChangeLog @@ -1,3 +1,8 @@ +2000-09-04 Ralf Corsepius + + * m68040/fpsp/Makefile.am, shared/cache/Makefile.am: Include + compile.am + 2000-08-10 Joel Sherrill * ChangeLog: New file. diff --git a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am b/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am index c4ffe3f26d..5565255342 100644 --- a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am +++ b/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am @@ -7,6 +7,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 PGM = $(ARCH)/fpsp.rel include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../automake/compile.am include $(top_srcdir)/../../../../../automake/lib.am C_FILES = rtems_fpsp.c diff --git a/c/src/lib/libcpu/m68k/shared/cache/Makefile.am b/c/src/lib/libcpu/m68k/shared/cache/Makefile.am index d94c4388c9..ca04231141 100644 --- a/c/src/lib/libcpu/m68k/shared/cache/Makefile.am +++ b/c/src/lib/libcpu/m68k/shared/cache/Makefile.am @@ -3,7 +3,6 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal VPATH = @srcdir@:@srcdir@/../../../shared/src @@ -11,11 +10,12 @@ C_FILES = cache.c cache_aligned_malloc.c cache_manager.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = cache_.h -INSTALLED_H_FILES = +INSTALLED_H_FILES = OBJS = $(C_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) @@ -29,10 +29,11 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h $(PROJECT_INCLUDE)/libcpu/cache.h: $(top_srcdir)/../shared/include/cache.h $(INSTALL_DATA) $< $@ -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu $(PROJECT_INCLUDE)/libcpu/cache.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \ + $(PROJECT_INCLUDE)/libcpu/cache.h all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) -EXTRA_DIST = cache.c cache_.h +EXTRA_DIST = cache.c cache_.h include $(top_srcdir)/../../../../../automake/local.am -- cgit v1.2.3