From e09c1b7129e108a5d2c2d1bf46cb66a61f1a9c00 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 5 Sep 2000 15:36:13 +0000 Subject: 2000-09-04 Ralf Corsepius * Makefile.am: Include compile.am, formatting. * rtems/Makefile.am: formatting. * rtems/score/Makefile.am: formatting. --- c/src/exec/score/cpu/c4x/ChangeLog | 6 ++++++ c/src/exec/score/cpu/c4x/Makefile.am | 8 +++++--- c/src/exec/score/cpu/c4x/rtems/Makefile.am | 4 ++-- c/src/exec/score/cpu/c4x/rtems/score/Makefile.am | 9 ++++----- cpukit/score/cpu/c4x/ChangeLog | 6 ++++++ cpukit/score/cpu/c4x/Makefile.am | 8 +++++--- 6 files changed, 28 insertions(+), 13 deletions(-) diff --git a/c/src/exec/score/cpu/c4x/ChangeLog b/c/src/exec/score/cpu/c4x/ChangeLog index 101734ce64..097f60baaf 100644 --- a/c/src/exec/score/cpu/c4x/ChangeLog +++ b/c/src/exec/score/cpu/c4x/ChangeLog @@ -1,3 +1,9 @@ +2000-09-04 Ralf Corsepius + + * Makefile.am: Include compile.am, formatting. + * rtems/Makefile.am: formatting. + * rtems/score/Makefile.am: formatting. + 2000-08-10 Joel Sherrill * ChangeLog: New file. diff --git a/c/src/exec/score/cpu/c4x/Makefile.am b/c/src/exec/score/cpu/c4x/Makefile.am index 5321ba508e..d74e963f85 100644 --- a/c/src/exec/score/cpu/c4x/Makefile.am +++ b/c/src/exec/score/cpu/c4x/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal @@ -18,6 +18,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) REL = $(ARCH)/rtems-cpu.rel include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) @@ -38,7 +39,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o -all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ + $(TMPINSTALL_FILES) .PRECIOUS: $(REL) diff --git a/c/src/exec/score/cpu/c4x/rtems/Makefile.am b/c/src/exec/score/cpu/c4x/rtems/Makefile.am index 900930a502..ef7df82af7 100644 --- a/c/src/exec/score/cpu/c4x/rtems/Makefile.am +++ b/c/src/exec/score/cpu/c4x/rtems/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/exec/score/cpu/c4x/rtems/score/Makefile.am b/c/src/exec/score/cpu/c4x/rtems/score/Makefile.am index 884f33acb1..44f554e30d 100644 --- a/c/src/exec/score/cpu/c4x/rtems/score/Makefile.am +++ b/c/src/exec/score/cpu/c4x/rtems/score/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -11,9 +11,8 @@ noinst_HEADERS = $(H_FILES) # (OPTIONAL) Add local stuff here using += # -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rtems/score \ -$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) $(PROJECT_INCLUDE)/rtems/score: $(mkinstalldirs) $@ diff --git a/cpukit/score/cpu/c4x/ChangeLog b/cpukit/score/cpu/c4x/ChangeLog index 101734ce64..097f60baaf 100644 --- a/cpukit/score/cpu/c4x/ChangeLog +++ b/cpukit/score/cpu/c4x/ChangeLog @@ -1,3 +1,9 @@ +2000-09-04 Ralf Corsepius + + * Makefile.am: Include compile.am, formatting. + * rtems/Makefile.am: formatting. + * rtems/score/Makefile.am: formatting. + 2000-08-10 Joel Sherrill * ChangeLog: New file. diff --git a/cpukit/score/cpu/c4x/Makefile.am b/cpukit/score/cpu/c4x/Makefile.am index 5321ba508e..d74e963f85 100644 --- a/cpukit/score/cpu/c4x/Makefile.am +++ b/cpukit/score/cpu/c4x/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal @@ -18,6 +18,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) REL = $(ARCH)/rtems-cpu.rel include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) @@ -38,7 +39,8 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o -all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ + $(TMPINSTALL_FILES) .PRECIOUS: $(REL) -- cgit v1.2.3