From f08808ee913161c80d03817cd6b213dc1c184259 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 11 Jan 2004 05:40:53 +0000 Subject: 2004-01-11 Ralf Corsepius * Makefile.am: Include compile.am, again. --- cpukit/score/cpu/arm/ChangeLog | 4 ++++ cpukit/score/cpu/arm/Makefile.am | 2 +- cpukit/score/cpu/c4x/ChangeLog | 4 ++++ cpukit/score/cpu/c4x/Makefile.am | 2 +- cpukit/score/cpu/h8300/ChangeLog | 4 ++++ cpukit/score/cpu/h8300/Makefile.am | 2 +- cpukit/score/cpu/i386/ChangeLog | 4 ++++ cpukit/score/cpu/i386/Makefile.am | 2 +- cpukit/score/cpu/i960/ChangeLog | 4 ++++ cpukit/score/cpu/i960/Makefile.am | 2 +- cpukit/score/cpu/m68k/ChangeLog | 4 ++++ cpukit/score/cpu/m68k/Makefile.am | 17 +++++++++-------- cpukit/score/cpu/mips/ChangeLog | 4 ++++ cpukit/score/cpu/mips/Makefile.am | 2 +- cpukit/score/cpu/no_cpu/ChangeLog | 4 ++++ cpukit/score/cpu/no_cpu/Makefile.am | 3 +-- cpukit/score/cpu/or32/ChangeLog | 4 ++++ cpukit/score/cpu/or32/Makefile.am | 2 +- cpukit/score/cpu/powerpc/ChangeLog | 4 ++++ cpukit/score/cpu/powerpc/Makefile.am | 2 +- cpukit/score/cpu/sh/ChangeLog | 4 ++++ cpukit/score/cpu/sh/Makefile.am | 2 +- cpukit/score/cpu/sparc/ChangeLog | 4 ++++ cpukit/score/cpu/sparc/Makefile.am | 2 +- cpukit/score/cpu/unix/ChangeLog | 4 ++++ cpukit/score/cpu/unix/Makefile.am | 2 +- 26 files changed, 73 insertions(+), 21 deletions(-) (limited to 'cpukit') diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog index bc01ff4a4d..8f4e193866 100644 --- a/cpukit/score/cpu/arm/ChangeLog +++ b/cpukit/score/cpu/arm/ChangeLog @@ -1,3 +1,7 @@ +2004-01-11 Ralf Corsepius + + * Makefile.am: Include compile.am, again. + 2004-01-11 Ralf Corsepius * Makefile.am: Convert to using automake compilation rules. diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am index 4e748a8db6..141b2a4dda 100644 --- a/cpukit/score/cpu/arm/Makefile.am +++ b/cpukit/score/cpu/arm/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am -include $(top_srcdir)/../../../automake/amcompile.am +include $(top_srcdir)/../../../automake/compile.am include_HEADERS = asm.h diff --git a/cpukit/score/cpu/c4x/ChangeLog b/cpukit/score/cpu/c4x/ChangeLog index 64706af8d0..15d14220da 100644 --- a/cpukit/score/cpu/c4x/ChangeLog +++ b/cpukit/score/cpu/c4x/ChangeLog @@ -1,3 +1,7 @@ +2004-01-11 Ralf Corsepius + + * Makefile.am: Include compile.am, again. + 2004-01-11 Ralf Corsepius * Makefile.am: Convert to using automake compilation rules. diff --git a/cpukit/score/cpu/c4x/Makefile.am b/cpukit/score/cpu/c4x/Makefile.am index bcd463d3f9..2de00a584e 100644 --- a/cpukit/score/cpu/c4x/Makefile.am +++ b/cpukit/score/cpu/c4x/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am -include $(top_srcdir)/../../../automake/amcompile.am +include $(top_srcdir)/../../../automake/compile.am include_HEADERS = asm.h c4xio.h diff --git a/cpukit/score/cpu/h8300/ChangeLog b/cpukit/score/cpu/h8300/ChangeLog index 5ae07cfc13..97111f5e0c 100644 --- a/cpukit/score/cpu/h8300/ChangeLog +++ b/cpukit/score/cpu/h8300/ChangeLog @@ -1,3 +1,7 @@ +2004-01-11 Ralf Corsepius + + * Makefile.am: Include compile.am, again. + 2004-01-11 Ralf Corsepius * Makefile.am: Convert to using automake compilation rules. diff --git a/cpukit/score/cpu/h8300/Makefile.am b/cpukit/score/cpu/h8300/Makefile.am index dadbf9c3af..bf4f966199 100644 --- a/cpukit/score/cpu/h8300/Makefile.am +++ b/cpukit/score/cpu/h8300/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am -include $(top_srcdir)/../../../automake/amcompile.am +include $(top_srcdir)/../../../automake/compile.am include_HEADERS = asm.h diff --git a/cpukit/score/cpu/i386/ChangeLog b/cpukit/score/cpu/i386/ChangeLog index aebea0ef28..c800c96db4 100644 --- a/cpukit/score/cpu/i386/ChangeLog +++ b/cpukit/score/cpu/i386/ChangeLog @@ -1,3 +1,7 @@ +2004-01-11 Ralf Corsepius + + * Makefile.am: Include compile.am, again. + 2004-01-11 Ralf Corsepius * Makefile.am: Convert to using automake compilation rules. diff --git a/cpukit/score/cpu/i386/Makefile.am b/cpukit/score/cpu/i386/Makefile.am index 80ec2e6383..6b10a74415 100644 --- a/cpukit/score/cpu/i386/Makefile.am +++ b/cpukit/score/cpu/i386/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am -include $(top_srcdir)/../../../automake/amcompile.am +include $(top_srcdir)/../../../automake/compile.am include_HEADERS= asm.h diff --git a/cpukit/score/cpu/i960/ChangeLog b/cpukit/score/cpu/i960/ChangeLog index 884deb522b..3cc8722d54 100644 --- a/cpukit/score/cpu/i960/ChangeLog +++ b/cpukit/score/cpu/i960/ChangeLog @@ -1,3 +1,7 @@ +2004-01-11 Ralf Corsepius + + * Makefile.am: Include compile.am, again. + 2004-01-11 Ralf Corsepius * Makefile.am: Convert to using automake compilation rules. diff --git a/cpukit/score/cpu/i960/Makefile.am b/cpukit/score/cpu/i960/Makefile.am index 8cd702647e..a85252380d 100644 --- a/cpukit/score/cpu/i960/Makefile.am +++ b/cpukit/score/cpu/i960/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am -include $(top_srcdir)/../../../automake/amcompile.am +include $(top_srcdir)/../../../automake/compile.am include_HEADERS = asm.h diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog index d74df64dce..e4f588933d 100644 --- a/cpukit/score/cpu/m68k/ChangeLog +++ b/cpukit/score/cpu/m68k/ChangeLog @@ -1,3 +1,7 @@ +2004-01-11 Ralf Corsepius + + * Makefile.am: Include compile.am, again. + 2004-01-11 Ralf Corsepius * Makefile.am: Convert to using automake compilation rules. diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am index 1300d2943d..f4a32e66ec 100644 --- a/cpukit/score/cpu/m68k/Makefile.am +++ b/cpukit/score/cpu/m68k/Makefile.am @@ -5,8 +5,15 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am -include $(top_srcdir)/../../../automake/amcompile.am -include $(top_srcdir)/../../../automake/lib.am +include $(top_srcdir)/../../../automake/compile.am + +EXTRA_LIBRARIES = libscorecpu.a +CLEANFILES = libscorecpu.a +libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) + +EXTRA_LIBRARIES += libscorecpu_g.a +CLEANFILES += libscorecpu_g.a +libscorecpu_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) include_HEADERS = asm.h m68302.h m68360.h qsm.h sim.h @@ -14,15 +21,9 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/m68k.h \ rtems/score/types.h -EXTRA_LIBRARIES = libscorecpu.a -CLEANFILES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.S -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libscorecpu_g.a -CLEANFILES += libscorecpu_g.a libscorecpu_g_a_SOURCES = $(libscorecpu_a_SOURCES) -libscorecpu_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) all-local: $(PREINSTALL_FILES) libscorecpu$(LIB_VARIANT).a diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog index 014a44685c..5884b13074 100644 --- a/cpukit/score/cpu/mips/ChangeLog +++ b/cpukit/score/cpu/mips/ChangeLog @@ -1,3 +1,7 @@ +2004-01-11 Ralf Corsepius + + * Makefile.am: Include compile.am, again. + 2004-01-11 Ralf Corsepius * Makefile.am: Convert to using automake compilation rules. diff --git a/cpukit/score/cpu/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am index 00e3f691ae..ec815d8062 100644 --- a/cpukit/score/cpu/mips/Makefile.am +++ b/cpukit/score/cpu/mips/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am -include $(top_srcdir)/../../../automake/amcompile.am +include $(top_srcdir)/../../../automake/compile.am include_HEADERS = asm.h idtcpu.h iregdef.h diff --git a/cpukit/score/cpu/no_cpu/ChangeLog b/cpukit/score/cpu/no_cpu/ChangeLog index 6df710caea..06499c8a35 100644 --- a/cpukit/score/cpu/no_cpu/ChangeLog +++ b/cpukit/score/cpu/no_cpu/ChangeLog @@ -1,3 +1,7 @@ +2004-01-11 Ralf Corsepius + + * Makefile.am: Include compile.am, again. + 2004-01-11 Ralf Corsepius * Makefile.am: Convert to using automake compilation rules. diff --git a/cpukit/score/cpu/no_cpu/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am index 61ad9ec7a5..752866b0bf 100644 --- a/cpukit/score/cpu/no_cpu/Makefile.am +++ b/cpukit/score/cpu/no_cpu/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am -include $(top_srcdir)/../../../automake/amcompile.am +include $(top_srcdir)/../../../automake/compile.am include_HEADERS = asm.h @@ -25,7 +25,6 @@ libscorecpu_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) all-local: $(PREINSTALL_FILES) libscorecpu$(LIB_VARIANT).a - PREINSTALL_FILES = $(PROJECT_INCLUDE)/$(dirstamp): diff --git a/cpukit/score/cpu/or32/ChangeLog b/cpukit/score/cpu/or32/ChangeLog index 1ce97782d8..4730e468ba 100644 --- a/cpukit/score/cpu/or32/ChangeLog +++ b/cpukit/score/cpu/or32/ChangeLog @@ -1,3 +1,7 @@ +2004-01-11 Ralf Corsepius + + * Makefile.am: Include compile.am, again. + 2004-01-11 Ralf Corsepius * Makefile.am: Convert to using automake compilation rules. diff --git a/cpukit/score/cpu/or32/Makefile.am b/cpukit/score/cpu/or32/Makefile.am index 369fac2ada..6615f46445 100644 --- a/cpukit/score/cpu/or32/Makefile.am +++ b/cpukit/score/cpu/or32/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am -include $(top_srcdir)/../../../automake/amcompile.am +include $(top_srcdir)/../../../automake/compile.am include_HEADERS= asm.h diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog index 80f489df5b..7506d666f0 100644 --- a/cpukit/score/cpu/powerpc/ChangeLog +++ b/cpukit/score/cpu/powerpc/ChangeLog @@ -1,3 +1,7 @@ +2004-01-11 Ralf Corsepius + + * Makefile.am: Include compile.am, again. + 2004-01-11 Ralf Corsepius * Makefile.am: Convert to using automake compilation rules. diff --git a/cpukit/score/cpu/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am index 2243b03e41..4758f64925 100644 --- a/cpukit/score/cpu/powerpc/Makefile.am +++ b/cpukit/score/cpu/powerpc/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am -include $(top_srcdir)/../../../automake/amcompile.am +include $(top_srcdir)/../../../automake/compile.am include_HEADERS = asm.h diff --git a/cpukit/score/cpu/sh/ChangeLog b/cpukit/score/cpu/sh/ChangeLog index 3b435119e8..684502c65d 100644 --- a/cpukit/score/cpu/sh/ChangeLog +++ b/cpukit/score/cpu/sh/ChangeLog @@ -1,3 +1,7 @@ +2004-01-11 Ralf Corsepius + + * Makefile.am: Include compile.am, again. + 2004-01-11 Ralf Corsepius * Makefile.am: Convert to using automake compilation rules. diff --git a/cpukit/score/cpu/sh/Makefile.am b/cpukit/score/cpu/sh/Makefile.am index effd7d02fe..c95886560e 100644 --- a/cpukit/score/cpu/sh/Makefile.am +++ b/cpukit/score/cpu/sh/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am -include $(top_srcdir)/../../../automake/amcompile.am +include $(top_srcdir)/../../../automake/compile.am include_HEADERS= asm.h diff --git a/cpukit/score/cpu/sparc/ChangeLog b/cpukit/score/cpu/sparc/ChangeLog index e964a5fc9a..285e68d386 100644 --- a/cpukit/score/cpu/sparc/ChangeLog +++ b/cpukit/score/cpu/sparc/ChangeLog @@ -1,3 +1,7 @@ +2004-01-11 Ralf Corsepius + + * Makefile.am: Include compile.am, again. + 2004-01-11 Ralf Corsepius * Makefile.am: Convert to using automake compilation rules. diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am index 3d7b34c008..84925e06bc 100644 --- a/cpukit/score/cpu/sparc/Makefile.am +++ b/cpukit/score/cpu/sparc/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am -include $(top_srcdir)/../../../automake/amcompile.am +include $(top_srcdir)/../../../automake/compile.am include_HEADERS= asm.h diff --git a/cpukit/score/cpu/unix/ChangeLog b/cpukit/score/cpu/unix/ChangeLog index 846a073186..6f55830ae1 100644 --- a/cpukit/score/cpu/unix/ChangeLog +++ b/cpukit/score/cpu/unix/ChangeLog @@ -1,3 +1,7 @@ +2004-01-11 Ralf Corsepius + + * Makefile.am: Include compile.am, again. + 2004-01-11 Ralf Corsepius * Makefile.am: Convert to using automake compilation rules. diff --git a/cpukit/score/cpu/unix/Makefile.am b/cpukit/score/cpu/unix/Makefile.am index 878b2c9926..6ea34ab4ef 100644 --- a/cpukit/score/cpu/unix/Makefile.am +++ b/cpukit/score/cpu/unix/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal include $(top_srcdir)/../../../automake/multilib.am -include $(top_srcdir)/../../../automake/amcompile.am +include $(top_srcdir)/../../../automake/compile.am AM_CPPFLAGS += -DCPU_SYNC_IO $(LIBC_DEFINES) -- cgit v1.2.3