From b98c8c9b7c618d54173ebc5adc85993e4dad0b22 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 5 Mar 2001 22:47:50 +0000 Subject: 2001-03-03 Ralf Corsepius * m68040/fpsp/Makefile.am, shared/cache/Makefile.am: Apply include_*HEADERS instead of H_FILES. --- c/src/lib/libcpu/m68k/ChangeLog | 5 +++++ c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am | 2 +- c/src/lib/libcpu/m68k/shared/cache/Makefile.am | 14 +++++++++----- 3 files changed, 15 insertions(+), 6 deletions(-) (limited to 'c/src/lib/libcpu/m68k') diff --git a/c/src/lib/libcpu/m68k/ChangeLog b/c/src/lib/libcpu/m68k/ChangeLog index 9e372e9dab..df1026b1e8 100644 --- a/c/src/lib/libcpu/m68k/ChangeLog +++ b/c/src/lib/libcpu/m68k/ChangeLog @@ -1,3 +1,8 @@ +2001-03-03 Ralf Corsepius + + * m68040/fpsp/Makefile.am, shared/cache/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2000-11-09 Ralf Corsepius * Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS. diff --git a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am b/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am index 5565255342..35f09dfff6 100644 --- a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am +++ b/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am @@ -13,7 +13,7 @@ include $(top_srcdir)/../../../../../automake/lib.am C_FILES = rtems_fpsp.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = fpsp.defs +noinst_HEADERS = fpsp.defs S_FILES = bindec.S binstr.S bugfix.S decbin.S do_func.S gen_except.S \ get_op.S kernel_ex.S res_func.S round.S rtems_skel.S sacos.S sasin.S \ diff --git a/c/src/lib/libcpu/m68k/shared/cache/Makefile.am b/c/src/lib/libcpu/m68k/shared/cache/Makefile.am index ca04231141..3c0c1b18b8 100644 --- a/c/src/lib/libcpu/m68k/shared/cache/Makefile.am +++ b/c/src/lib/libcpu/m68k/shared/cache/Makefile.am @@ -9,8 +9,10 @@ VPATH = @srcdir@:@srcdir@/../../../shared/src 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 = +include_libcpudir = $(includedir)/libcpu + +noinst_HEADERS = cache_.h +include_libcpu_HEADERS = cache.h OBJS = $(C_O_FILES) @@ -26,14 +28,16 @@ $(PROJECT_INCLUDE)/libcpu: $(PROJECT_INCLUDE)/libcpu/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/libcpu/cache.h: $(top_srcdir)/../shared/include/cache.h - $(INSTALL_DATA) $< $@ +cache.h: $(top_srcdir)/../shared/include/cache.h + cp $< $@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \ - $(PROJECT_INCLUDE)/libcpu/cache.h + $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%) all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) +CLEANFILES += cache.h + EXTRA_DIST = cache.c cache_.h include $(top_srcdir)/../../../../../automake/local.am -- cgit v1.2.3