From f346774df685cd743e37dca5fc87ec56053e48f7 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 1 Jan 2005 10:31:38 +0000 Subject: 2005-01-01 Ralf Corsepius * Makefile.am: Remove build-variant support. --- cpukit/score/cpu/arm/ChangeLog | 4 ++++ cpukit/score/cpu/arm/Makefile.am | 12 +++--------- cpukit/score/cpu/avr/ChangeLog | 4 ++++ cpukit/score/cpu/avr/Makefile.am | 12 +++--------- cpukit/score/cpu/c4x/ChangeLog | 4 ++++ cpukit/score/cpu/c4x/Makefile.am | 12 +++--------- cpukit/score/cpu/h8300/ChangeLog | 4 ++++ cpukit/score/cpu/h8300/Makefile.am | 12 +++--------- cpukit/score/cpu/i386/ChangeLog | 4 ++++ cpukit/score/cpu/i386/Makefile.am | 12 +++--------- cpukit/score/cpu/m68k/ChangeLog | 4 ++++ cpukit/score/cpu/m68k/Makefile.am | 13 +++---------- cpukit/score/cpu/mips/ChangeLog | 4 ++++ cpukit/score/cpu/mips/Makefile.am | 12 +++--------- cpukit/score/cpu/no_cpu/ChangeLog | 4 ++++ cpukit/score/cpu/no_cpu/Makefile.am | 12 +++--------- cpukit/score/cpu/or32/ChangeLog | 4 ++++ cpukit/score/cpu/or32/Makefile.am | 12 +++--------- cpukit/score/cpu/sh/ChangeLog | 4 ++++ cpukit/score/cpu/sh/Makefile.am | 12 +++--------- cpukit/score/cpu/sparc/ChangeLog | 4 ++++ cpukit/score/cpu/sparc/Makefile.am | 12 +++--------- cpukit/score/cpu/unix/ChangeLog | 4 ++++ cpukit/score/cpu/unix/Makefile.am | 12 +++--------- 24 files changed, 84 insertions(+), 109 deletions(-) diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog index 78d39feaaa..c2e49da692 100644 --- a/cpukit/score/cpu/arm/ChangeLog +++ b/cpukit/score/cpu/arm/ChangeLog @@ -1,3 +1,7 @@ +2005-01-01 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-21 Ralf Corsepius * rtems/score/types.h: Use __rtems_score_types_h as preprocessor diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am index f3231c01ab..b7997a6b90 100644 --- a/cpukit/score/cpu/arm/Makefile.am +++ b/cpukit/score/cpu/arm/Makefile.am @@ -11,17 +11,11 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/cpu_asm.h \ rtems/score/arm.h rtems/score/types.h -EXTRA_LIBRARIES = libscorecpu.a -CLEANFILES = libscorecpu.a +noinst_LIBRARIES = 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 +all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = PREINSTALL_FILES = @@ -56,7 +50,7 @@ $(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/r $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/avr/ChangeLog b/cpukit/score/cpu/avr/ChangeLog index 30784b6991..c992697252 100644 --- a/cpukit/score/cpu/avr/ChangeLog +++ b/cpukit/score/cpu/avr/ChangeLog @@ -1,3 +1,7 @@ +2005-01-01 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-21 Ralf Corsepius * asm.h: Add doxygen preamble. diff --git a/cpukit/score/cpu/avr/Makefile.am b/cpukit/score/cpu/avr/Makefile.am index fdca60e3a7..19fd188eb4 100644 --- a/cpukit/score/cpu/avr/Makefile.am +++ b/cpukit/score/cpu/avr/Makefile.am @@ -11,17 +11,11 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/avr.h \ rtems/score/cpu_asm.h rtems/score/types.h -EXTRA_LIBRARIES = libscorecpu.a -CLEANFILES = libscorecpu.a +noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.c 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 +all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = PREINSTALL_FILES = @@ -56,7 +50,7 @@ $(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/r $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/c4x/ChangeLog b/cpukit/score/cpu/c4x/ChangeLog index 17876969c0..440805edf5 100644 --- a/cpukit/score/cpu/c4x/ChangeLog +++ b/cpukit/score/cpu/c4x/ChangeLog @@ -1,3 +1,7 @@ +2005-01-01 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-21 Ralf Corsepius * rtems/score/types.h: Use __rtems_score_types_h as preprocessor diff --git a/cpukit/score/cpu/c4x/Makefile.am b/cpukit/score/cpu/c4x/Makefile.am index 24378adb05..0de87c86f0 100644 --- a/cpukit/score/cpu/c4x/Makefile.am +++ b/cpukit/score/cpu/c4x/Makefile.am @@ -14,17 +14,11 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/c4x.h \ rtems/score/types.h rtems/score/cpu_asm.h -EXTRA_LIBRARIES = libscorecpu.a -CLEANFILES = libscorecpu.a +noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c irq.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 +all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = PREINSTALL_FILES = @@ -68,7 +62,7 @@ $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUD $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/h8300/ChangeLog b/cpukit/score/cpu/h8300/ChangeLog index ac9881ed5d..b6e8e31d21 100644 --- a/cpukit/score/cpu/h8300/ChangeLog +++ b/cpukit/score/cpu/h8300/ChangeLog @@ -1,3 +1,7 @@ +2005-01-01 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-12-10 Ralf Corsepius PR 733/rtems diff --git a/cpukit/score/cpu/h8300/Makefile.am b/cpukit/score/cpu/h8300/Makefile.am index 328037e175..d515534bea 100644 --- a/cpukit/score/cpu/h8300/Makefile.am +++ b/cpukit/score/cpu/h8300/Makefile.am @@ -11,17 +11,11 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/h8300.h \ rtems/score/types.h -EXTRA_LIBRARIES = libscorecpu.a -CLEANFILES = libscorecpu.a +noinst_LIBRARIES = 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 +all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = PREINSTALL_FILES = @@ -52,7 +46,7 @@ $(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/r $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/i386/ChangeLog b/cpukit/score/cpu/i386/ChangeLog index e1d8cab941..d4bab6be16 100644 --- a/cpukit/score/cpu/i386/ChangeLog +++ b/cpukit/score/cpu/i386/ChangeLog @@ -1,3 +1,7 @@ +2005-01-01 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-21 Ralf Corsepius * rtems/score/types.h: Use __rtems_score_types_h as preprocessor diff --git a/cpukit/score/cpu/i386/Makefile.am b/cpukit/score/cpu/i386/Makefile.am index 243fc91436..e1701e1652 100644 --- a/cpukit/score/cpu/i386/Makefile.am +++ b/cpukit/score/cpu/i386/Makefile.am @@ -12,17 +12,11 @@ include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/i386.h \ rtems/score/types.h rtems/score/interrupts.h rtems/score/registers.h \ rtems/score/idtr.h -EXTRA_LIBRARIES = libscorecpu.a -CLEANFILES = libscorecpu.a +noinst_LIBRARIES = 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 +all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = PREINSTALL_FILES = @@ -65,7 +59,7 @@ $(PROJECT_INCLUDE)/rtems/score/idtr.h: rtems/score/idtr.h $(PROJECT_INCLUDE)/rte $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/idtr.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/idtr.h -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog index ae34eca514..de82fa88ed 100644 --- a/cpukit/score/cpu/m68k/ChangeLog +++ b/cpukit/score/cpu/m68k/ChangeLog @@ -1,3 +1,7 @@ +2005-01-01 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-21 Ralf Corsepius * rtems/score/types.h: Use __rtems_score_types_h as preprocessor diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am index f5323ff629..92dd5097ab 100644 --- a/cpukit/score/cpu/m68k/Makefile.am +++ b/cpukit/score/cpu/m68k/Makefile.am @@ -4,14 +4,9 @@ include $(top_srcdir)/automake/compile.am -EXTRA_LIBRARIES = libscorecpu.a -CLEANFILES = libscorecpu.a +noinst_LIBRARIES = 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_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = asm.h @@ -24,9 +19,7 @@ include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/m68k.h \ libscorecpu_a_SOURCES = cpu.c cpu_asm.S -libscorecpu_g_a_SOURCES = $(libscorecpu_a_SOURCES) - -all-local: $(PREINSTALL_FILES) libscorecpu$(LIB_VARIANT).a +all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = PREINSTALL_FILES = @@ -78,7 +71,7 @@ $(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/r $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog index 216153ea8f..f61d26053f 100644 --- a/cpukit/score/cpu/mips/ChangeLog +++ b/cpukit/score/cpu/mips/ChangeLog @@ -1,3 +1,7 @@ +2005-01-01 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-12-02 Greg Menke PR 730 * cpu_asm.S: Collected PR 601 changes for commit to cvshead diff --git a/cpukit/score/cpu/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am index 04613e3922..8df0c1ea64 100644 --- a/cpukit/score/cpu/mips/Makefile.am +++ b/cpukit/score/cpu/mips/Makefile.am @@ -14,17 +14,11 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/mips.h \ rtems/score/types.h -EXTRA_LIBRARIES = libscorecpu.a -CLEANFILES = libscorecpu.a +noinst_LIBRARIES = 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 +all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = PREINSTALL_FILES = @@ -68,7 +62,7 @@ $(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/r $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/no_cpu/ChangeLog b/cpukit/score/cpu/no_cpu/ChangeLog index 6c36cc2cd2..c134a5b76d 100644 --- a/cpukit/score/cpu/no_cpu/ChangeLog +++ b/cpukit/score/cpu/no_cpu/ChangeLog @@ -1,3 +1,7 @@ +2005-01-01 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-21 Ralf Corsepius * rtems/score/types.h: Use __rtems_score_types_h as preprocessor diff --git a/cpukit/score/cpu/no_cpu/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am index ef22e75798..cec9d0a95d 100644 --- a/cpukit/score/cpu/no_cpu/Makefile.am +++ b/cpukit/score/cpu/no_cpu/Makefile.am @@ -11,17 +11,11 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/no_cpu.h \ rtems/score/cpu_asm.h rtems/score/types.h -EXTRA_LIBRARIES = libscorecpu.a -CLEANFILES = libscorecpu.a +noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.c 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 +all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = PREINSTALL_FILES = @@ -56,7 +50,7 @@ $(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/r $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/or32/ChangeLog b/cpukit/score/cpu/or32/ChangeLog index cea91c0a55..c88c385725 100644 --- a/cpukit/score/cpu/or32/ChangeLog +++ b/cpukit/score/cpu/or32/ChangeLog @@ -1,3 +1,7 @@ +2005-01-01 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-21 Ralf Corsepius * rtems/score/types.h: Use __rtems_score_types_h as preprocessor diff --git a/cpukit/score/cpu/or32/Makefile.am b/cpukit/score/cpu/or32/Makefile.am index 404c57e564..bab22ca3b8 100644 --- a/cpukit/score/cpu/or32/Makefile.am +++ b/cpukit/score/cpu/or32/Makefile.am @@ -11,17 +11,11 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/types.h \ rtems/score/or32.h rtems/score/cpu_asm.h -EXTRA_LIBRARIES = libscorecpu.a -CLEANFILES = libscorecpu.a +noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.c 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 +all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = PREINSTALL_FILES = @@ -56,7 +50,7 @@ $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h $(PROJECT_INCLUD $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/sh/ChangeLog b/cpukit/score/cpu/sh/ChangeLog index b57357a34e..50b788149e 100644 --- a/cpukit/score/cpu/sh/ChangeLog +++ b/cpukit/score/cpu/sh/ChangeLog @@ -1,3 +1,7 @@ +2005-01-01 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-21 Ralf Corsepius * rtems/score/types.h: Use __rtems_score_types_h as preprocessor diff --git a/cpukit/score/cpu/sh/Makefile.am b/cpukit/score/cpu/sh/Makefile.am index 3fbdc75065..35ef6b429d 100644 --- a/cpukit/score/cpu/sh/Makefile.am +++ b/cpukit/score/cpu/sh/Makefile.am @@ -11,17 +11,11 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/types.h \ rtems/score/sh.h rtems/score/sh_io.h -EXTRA_LIBRARIES = libscorecpu.a -CLEANFILES = libscorecpu.a +noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c 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 +all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = PREINSTALL_FILES = @@ -56,7 +50,7 @@ $(PROJECT_INCLUDE)/rtems/score/sh_io.h: rtems/score/sh_io.h $(PROJECT_INCLUDE)/r $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh_io.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh_io.h -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/sparc/ChangeLog b/cpukit/score/cpu/sparc/ChangeLog index 587053de56..e5cf50d016 100644 --- a/cpukit/score/cpu/sparc/ChangeLog +++ b/cpukit/score/cpu/sparc/ChangeLog @@ -1,3 +1,7 @@ +2005-01-01 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-21 Ralf Corsepius * rtems/score/types.h: Use __rtems_score_types_h as preprocessor diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am index 9918078740..21b8fff73d 100644 --- a/cpukit/score/cpu/sparc/Makefile.am +++ b/cpukit/score/cpu/sparc/Makefile.am @@ -11,17 +11,11 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/sparc.h rtems/score/cpu.h \ rtems/score/types.h -EXTRA_LIBRARIES = libscorecpu.a -CLEANFILES = libscorecpu.a +noinst_LIBRARIES = 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 +all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = PREINSTALL_FILES = @@ -52,7 +46,7 @@ $(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h $(PROJECT_INCLUDE)/r $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/unix/ChangeLog b/cpukit/score/cpu/unix/ChangeLog index 892f65190e..75f553af5f 100644 --- a/cpukit/score/cpu/unix/ChangeLog +++ b/cpukit/score/cpu/unix/ChangeLog @@ -1,3 +1,7 @@ +2005-01-01 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-21 Ralf Corsepius * rtems/score/types.h: Use __rtems_score_types_h as preprocessor diff --git a/cpukit/score/cpu/unix/Makefile.am b/cpukit/score/cpu/unix/Makefile.am index 5da21f5edc..0042ba6c38 100644 --- a/cpukit/score/cpu/unix/Makefile.am +++ b/cpukit/score/cpu/unix/Makefile.am @@ -13,17 +13,11 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = rtems/score/types.h rtems/score/cpu.h \ rtems/score/unix.h -EXTRA_LIBRARIES = libscorecpu.a -CLEANFILES = libscorecpu.a +noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c 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 +all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = PREINSTALL_FILES = @@ -54,7 +48,7 @@ $(PROJECT_INCLUDE)/rtems/score/unix.h: rtems/score/unix.h $(PROJECT_INCLUDE)/rte $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/unix.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/unix.h -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am -- cgit v1.2.3