From ad9721efaafca66be29eca82cfe442e61e09c145 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 1 Dec 2003 11:26:09 +0000 Subject: 2003-12-01 Ralf Corsepius * Makefile.am: Reformat. Use dirstamps for preinstallation. * i960ca/Makefile.am: Reformat. * i960ka/Makefile.am: Reformat. * i960rp/Makefile.am: Reformat. --- c/src/lib/libcpu/i960/ChangeLog | 7 +++++++ c/src/lib/libcpu/i960/Makefile.am | 32 +++++++++++++++++++++++++------- c/src/lib/libcpu/i960/i960ca/Makefile.am | 1 - c/src/lib/libcpu/i960/i960ka/Makefile.am | 1 - c/src/lib/libcpu/i960/i960rp/Makefile.am | 1 - 5 files changed, 32 insertions(+), 10 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libcpu/i960/ChangeLog b/c/src/lib/libcpu/i960/ChangeLog index dd575dd583..2f0a2a7599 100644 --- a/c/src/lib/libcpu/i960/ChangeLog +++ b/c/src/lib/libcpu/i960/ChangeLog @@ -1,3 +1,10 @@ +2003-12-01 Ralf Corsepius + + * Makefile.am: Reformat. Use dirstamps for preinstallation. + * i960ca/Makefile.am: Reformat. + * i960ka/Makefile.am: Reformat. + * i960rp/Makefile.am: Reformat. + 2003-10-22 Ralf Corsepius * configure.ac: Remove RTEMS_CANONICAL_HOST. diff --git a/c/src/lib/libcpu/i960/Makefile.am b/c/src/lib/libcpu/i960/Makefile.am index a628f7871a..ab80416a5b 100644 --- a/c/src/lib/libcpu/i960/Makefile.am +++ b/c/src/lib/libcpu/i960/Makefile.am @@ -11,16 +11,34 @@ include_libcpudir = $(includedir)/libcpu include_libcpu_HEADERS = include/i960CA.h include/i960HA.h include/i960KA.h \ include/i960RP.h include/i960JX_RP_common.h -$(PROJECT_INCLUDE)/libcpu: - $(mkinstalldirs) $@ +all-local: $(TMPINSTALL_FILES) -$(PROJECT_INCLUDE)/libcpu/%.h: include/%.h - $(INSTALL_DATA) $< $@ +PREINSTALL_FILES = -TMPINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \ - $(include_libcpu_HEADERS:include/%.h=$(PROJECT_INCLUDE)/libcpu/%) +$(PROJECT_INCLUDE)/libcpu/$(dirstamp): + @$(mkinstalldirs) $(PROJECT_INCLUDE)/libcpu + @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -all-local: $(TMPINSTALL_FILES) +$(PROJECT_INCLUDE)/libcpu/i960CA.h: include/i960CA.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/i960CA.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/i960CA.h + +$(PROJECT_INCLUDE)/libcpu/i960HA.h: include/i960HA.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/i960HA.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/i960HA.h + +$(PROJECT_INCLUDE)/libcpu/i960KA.h: include/i960KA.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/i960KA.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/i960KA.h + +$(PROJECT_INCLUDE)/libcpu/i960RP.h: include/i960RP.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/i960RP.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/i960RP.h + +$(PROJECT_INCLUDE)/libcpu/i960JX_RP_common.h: include/i960JX_RP_common.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/i960JX_RP_common.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/i960JX_RP_common.h include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/i960/i960ca/Makefile.am b/c/src/lib/libcpu/i960/i960ca/Makefile.am index 460823454c..0c2ec4aa4e 100644 --- a/c/src/lib/libcpu/i960/i960ca/Makefile.am +++ b/c/src/lib/libcpu/i960/i960ca/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am diff --git a/c/src/lib/libcpu/i960/i960ka/Makefile.am b/c/src/lib/libcpu/i960/i960ka/Makefile.am index dc9f634d40..c7a2148d24 100644 --- a/c/src/lib/libcpu/i960/i960ka/Makefile.am +++ b/c/src/lib/libcpu/i960/i960ka/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am diff --git a/c/src/lib/libcpu/i960/i960rp/Makefile.am b/c/src/lib/libcpu/i960/i960rp/Makefile.am index 26c1dd8725..4e8197b056 100644 --- a/c/src/lib/libcpu/i960/i960rp/Makefile.am +++ b/c/src/lib/libcpu/i960/i960rp/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am -- cgit v1.2.3