From d8a78f4fb5fd9032522ef043e1584f31a7c17dfb Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 31 Jan 2002 21:33:38 +0000 Subject: [PATCH] 2002-01-31 Ralf Corsepius * Makefile.am: Reflect 2002-01-23 changes. --- c/src/exec/score/cpu/sh/ChangeLog | 4 ++ c/src/exec/score/cpu/sparc/ChangeLog | 4 ++ c/src/exec/score/cpu/sparc/Makefile.am | 51 ++++++++++++-------------- cpukit/score/cpu/sh/ChangeLog | 4 ++ cpukit/score/cpu/sparc/ChangeLog | 4 ++ cpukit/score/cpu/sparc/Makefile.am | 51 ++++++++++++-------------- 6 files changed, 64 insertions(+), 54 deletions(-) diff --git a/c/src/exec/score/cpu/sh/ChangeLog b/c/src/exec/score/cpu/sh/ChangeLog index 5960301a81..455fa1d663 100644 --- a/c/src/exec/score/cpu/sh/ChangeLog +++ b/c/src/exec/score/cpu/sh/ChangeLog @@ -1,3 +1,7 @@ +2002-01-31 Ralf Corsepius + + * Makefile.am: Reflect 2002-01-23 changes. + 2002-01-23 Ralf Corsepius * rtems/Makefile.am: Removed. diff --git a/c/src/exec/score/cpu/sparc/ChangeLog b/c/src/exec/score/cpu/sparc/ChangeLog index 945e8ef9e0..c03380e2a0 100644 --- a/c/src/exec/score/cpu/sparc/ChangeLog +++ b/c/src/exec/score/cpu/sparc/ChangeLog @@ -1,3 +1,7 @@ +2002-01-31 Ralf Corsepius + + * Makefile.am: Reflect 2002-01-23 changes. + 2001-01-30 Joel Sherrill * Makefile.am: Corrected so .h files from rtems/score/ are installed. diff --git a/c/src/exec/score/cpu/sparc/Makefile.am b/c/src/exec/score/cpu/sparc/Makefile.am index 5996de489b..b777393eb9 100644 --- a/c/src/exec/score/cpu/sparc/Makefile.am +++ b/c/src/exec/score/cpu/sparc/Makefile.am @@ -2,54 +2,52 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -include_HEADERS = asm.h - -S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) - -REL = $(ARCH)/rtems-cpu.rel - include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am -rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - $(PROJECT_INCLUDE)/rtems: $(mkinstalldirs) $@ $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ +include_HEADERS= asm.h +PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = \ + rtems/score/sparc.h \ + rtems/score/cpu.h \ + rtems/score/sparctypes.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) + +C_FILES = cpu.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + +REL = $(ARCH)/rtems-cpu.rel + +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) + $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = \ - rtems/score/cpu.h \ - rtems/score/sparc.h \ - rtems/score/sparctypes.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \ - $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) - TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ @@ -59,5 +57,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = cpu.c cpu_asm.S rtems.S -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/cpukit/score/cpu/sh/ChangeLog b/cpukit/score/cpu/sh/ChangeLog index 5960301a81..455fa1d663 100644 --- a/cpukit/score/cpu/sh/ChangeLog +++ b/cpukit/score/cpu/sh/ChangeLog @@ -1,3 +1,7 @@ +2002-01-31 Ralf Corsepius + + * Makefile.am: Reflect 2002-01-23 changes. + 2002-01-23 Ralf Corsepius * rtems/Makefile.am: Removed. diff --git a/cpukit/score/cpu/sparc/ChangeLog b/cpukit/score/cpu/sparc/ChangeLog index 945e8ef9e0..c03380e2a0 100644 --- a/cpukit/score/cpu/sparc/ChangeLog +++ b/cpukit/score/cpu/sparc/ChangeLog @@ -1,3 +1,7 @@ +2002-01-31 Ralf Corsepius + + * Makefile.am: Reflect 2002-01-23 changes. + 2001-01-30 Joel Sherrill * Makefile.am: Corrected so .h files from rtems/score/ are installed. diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am index 5996de489b..b777393eb9 100644 --- a/cpukit/score/cpu/sparc/Makefile.am +++ b/cpukit/score/cpu/sparc/Makefile.am @@ -2,54 +2,52 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -include_HEADERS = asm.h - -S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) - -REL = $(ARCH)/rtems-cpu.rel - include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am -rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - $(PROJECT_INCLUDE)/rtems: $(mkinstalldirs) $@ $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ +include_HEADERS= asm.h +PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = \ + rtems/score/sparc.h \ + rtems/score/cpu.h \ + rtems/score/sparctypes.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) + +C_FILES = cpu.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + +REL = $(ARCH)/rtems-cpu.rel + +rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) + $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ $(REL): $(rtems_cpu_rel_OBJECTS) $(make-rel) -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = \ - rtems/score/cpu.h \ - rtems/score/sparc.h \ - rtems/score/sparctypes.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \ - $(PROJECT_INCLUDE)/rtems/score \ - $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) - TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ @@ -59,5 +57,4 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ EXTRA_DIST = cpu.c cpu_asm.S rtems.S -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am