From 67c9abf43ccd541cca57e7532253565ca1884606 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 2 Jan 2005 12:32:04 +0000 Subject: 2005-01-02 Ralf Corsepius * m68040/Makefile.am, mcf5206/Makefile.am, mcf5272/Makefile.am, shared/Makefile.am: Remove build-variant support. --- c/src/lib/libcpu/m68k/ChangeLog | 5 ++++ c/src/lib/libcpu/m68k/m68040/Makefile.am | 15 ++-------- c/src/lib/libcpu/m68k/mcf5206/Makefile.am | 50 ++++--------------------------- c/src/lib/libcpu/m68k/mcf5272/Makefile.am | 38 +++++------------------ c/src/lib/libcpu/m68k/shared/Makefile.am | 29 +++--------------- 5 files changed, 24 insertions(+), 113 deletions(-) diff --git a/c/src/lib/libcpu/m68k/ChangeLog b/c/src/lib/libcpu/m68k/ChangeLog index 23d9d2aaf2..0cf21e078e 100644 --- a/c/src/lib/libcpu/m68k/ChangeLog +++ b/c/src/lib/libcpu/m68k/ChangeLog @@ -1,3 +1,8 @@ +2005-01-02 Ralf Corsepius + + * m68040/Makefile.am, mcf5206/Makefile.am, mcf5272/Makefile.am, + shared/Makefile.am: Remove build-variant support. + 2005-01-02 Ralf Corsepius * ChangeLog: Merge-in mcf5272/ChangeLog. diff --git a/c/src/lib/libcpu/m68k/m68040/Makefile.am b/c/src/lib/libcpu/m68k/m68040/Makefile.am index c0a3358763..06a7f6eafb 100644 --- a/c/src/lib/libcpu/m68k/m68040/Makefile.am +++ b/c/src/lib/libcpu/m68k/m68040/Makefile.am @@ -2,15 +2,12 @@ ## $Id$ ## -EXTRA_PROGRAMS = -CLEANFILES = -noinst_DATA = +noinst_PROGRAMS = include $(top_srcdir)/../../../automake/compile.am if m68040 -EXTRA_PROGRAMS += fpsp.rel -CLEANFILES += fpsp.rel +noinst_PROGRAMS += fpsp.rel fpsp_rel_SOURCES = fpsp/rtems_fpsp.c fpsp/bindec.S fpsp/binstr.S \ fpsp/bugfix.S fpsp/decbin.S fpsp/do_func.S fpsp/gen_except.S \ fpsp/get_op.S fpsp/kernel_ex.S fpsp/res_func.S fpsp/round.S \ @@ -24,14 +21,6 @@ fpsp_rel_SOURCES = fpsp/rtems_fpsp.c fpsp/bindec.S fpsp/binstr.S \ fpsp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) fpsp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += fpsp_g.rel -CLEANFILES += fpsp_g.rel -fpsp_g_rel_SOURCES = $(fpsp_rel_SOURCES) -fpsp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -fpsp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += fpsp$(LIB_VARIANT).rel - noinst_HEADERS = fpsp/fpsp.defs endif EXTRA_DIST = fpsp/README diff --git a/c/src/lib/libcpu/m68k/mcf5206/Makefile.am b/c/src/lib/libcpu/m68k/mcf5206/Makefile.am index b605e928c7..a259ecbdb3 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/Makefile.am +++ b/c/src/lib/libcpu/m68k/mcf5206/Makefile.am @@ -4,9 +4,7 @@ include $(top_srcdir)/../../../automake/compile.am -CLEANFILES = -EXTRA_PROGRAMS = -noinst_DATA = +noinst_PROGRAMS = if mcf5206 @@ -16,64 +14,28 @@ include_mcf5206_HEADERS = include/mcf5206e.h include/mcfmbus.h \ include/mcfuart.h ## clock -EXTRA_PROGRAMS += clock.rel -CLEANFILES += clock.rel +noinst_PROGRAMS += clock.rel clock_rel_SOURCES = clock/ckinit.c clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += clock_g.rel -CLEANFILES += clock_g.rel -clock_g_rel_SOURCES = $(clock_rel_SOURCES) -clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += clock$(LIB_VARIANT).rel - ## mcfuart -EXTRA_PROGRAMS += mcfuart.rel -CLEANFILES += mcfuart.rel +noinst_PROGRAMS += mcfuart.rel mcfuart_rel_SOURCES = console/mcfuart.c mcfuart_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) mcfuart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += mcfuart_g.rel -CLEANFILES += mcfuart_g.rel -mcfuart_g_rel_SOURCES = $(mcfuart_rel_SOURCES) -mcfuart_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -mcfuart_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += mcfuart$(LIB_VARIANT).rel - ## mbus -EXTRA_PROGRAMS += mbus.rel -CLEANFILES += mbus.rel +noinst_PROGRAMS += mbus.rel mbus_rel_SOURCES = mbus/mcfmbus.c mbus_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) mbus_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += mbus_g.rel -CLEANFILES += mbus_g.rel -mbus_g_rel_SOURCES = $(mbus_rel_SOURCES) -mbus_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -mbus_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += mbus$(LIB_VARIANT).rel - ## timer -EXTRA_PROGRAMS += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = timer/timer.c timer/timerisr.S timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -EXTRA_PROGRAMS += timer_g.rel -CLEANFILES += timer_g.rel -timer_g_rel_SOURCES = $(timer_rel_SOURCES) -timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += timer$(LIB_VARIANT).rel endif all-local: $(PREINSTALL_FILES) @@ -100,7 +62,7 @@ $(PROJECT_INCLUDE)/mcf5206/mcfuart.h: include/mcfuart.h $(PROJECT_INCLUDE)/mcf52 PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5206/mcfuart.h endif -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/m68k/mcf5272/Makefile.am b/c/src/lib/libcpu/m68k/mcf5272/Makefile.am index dacb1191f2..14393fabd1 100644 --- a/c/src/lib/libcpu/m68k/mcf5272/Makefile.am +++ b/c/src/lib/libcpu/m68k/mcf5272/Makefile.am @@ -4,9 +4,7 @@ include $(top_srcdir)/../../../automake/compile.am -CLEANFILES = -EXTRA_PROGRAMS = -noinst_DATA = +noinst_PROGRAMS = if mcf5272 @@ -15,49 +13,27 @@ include_mcf5272dir = $(includedir)/mcf5272 include_mcf5272_HEADERS = include/mcf5272.h ## clock -EXTRA_PROGRAMS += clock.rel -CLEANFILES += clock.rel +noinst_PROGRAMS += clock.rel clock_rel_SOURCES = clock/ckinit.c clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += clock_g.rel -CLEANFILES += clock_g.rel -clock_g_rel_SOURCES = $(clock_rel_SOURCES) -clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += clock$(LIB_VARIANT).rel - ## console #EXTRA_PROGRAMS += console.rel -#CLEANFILES += console.rel -#console_rel_SOURCES = console/console-io.c ../../../../libbsp/shared/console-polled.c +##console_rel_SOURCES = console/console-io.c ../../../../libbsp/shared/console-polled.c #console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) #console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) #EXTRA_PROGRAMS += console_g.rel -#CLEANFILES += console_g.rel -#console_g_rel_SOURCES = $(console_rel_SOURCES) -#console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -#console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) # -#noinst_DATA += console$(LIB_VARIANT).rel + +# ## timer -EXTRA_PROGRAMS += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = timer/timer.c timer/timerisr.S timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -EXTRA_PROGRAMS += timer_g.rel -CLEANFILES += timer_g.rel -timer_g_rel_SOURCES = $(timer_rel_SOURCES) -timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += timer$(LIB_VARIANT).rel endif all-local: $(PREINSTALL_FILES) @@ -76,7 +52,7 @@ $(PROJECT_INCLUDE)/mcf5272/mcf5272.h: include/mcf5272.h $(PROJECT_INCLUDE)/mcf52 PREINSTALL_FILES += $(PROJECT_INCLUDE)/mcf5272/mcf5272.h endif -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/m68k/shared/Makefile.am b/c/src/lib/libcpu/m68k/shared/Makefile.am index e41b7e2fb9..5cd156256f 100644 --- a/c/src/lib/libcpu/m68k/shared/Makefile.am +++ b/c/src/lib/libcpu/m68k/shared/Makefile.am @@ -2,10 +2,7 @@ ## $Id$ ## -CLEANFILES = -EXTRA_DIST = -EXTRA_PROGRAMS = -noinst_DATA = +noinst_PROGRAMS = include $(top_srcdir)/../../../automake/compile.am @@ -15,22 +12,13 @@ include_libcpudir = $(includedir)/libcpu ## cache include_libcpu_HEADERS = ../../shared/include/cache.h -EXTRA_PROGRAMS += cache.rel -CLEANFILES += cache.rel +noinst_PROGRAMS += cache.rel cache_rel_SOURCES = cache/cache.c cache/cache_.h \ ../../shared/src/cache_aligned_malloc.c \ ../../shared/src/cache_manager.c cache_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -I$(srcdir)/cache cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += cache_g.rel -CLEANFILES += cache_g.rel -cache_g_rel_SOURCES = $(cache_rel_SOURCES) -cache_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -I$(srcdir)/cache -cache_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += cache$(LIB_VARIANT).rel - ## misc # gcc doesn't recognize difference between the cpu32 and cpu32+ so we have to @@ -41,19 +29,10 @@ if mcf5272 M68K_CPPFLAGS = -Dmcf5272 endif -EXTRA_PROGRAMS += misc.rel -CLEANFILES += misc.rel +noinst_PROGRAMS += misc.rel misc_rel_SOURCES = misc/memcpy.c misc/m68kidle.c misc_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(M68K_CPPFLAGS) misc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -EXTRA_PROGRAMS += misc_g.rel -CLEANFILES += misc_g.rel -misc_g_rel_SOURCES = $(misc_rel_SOURCES) -misc_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(M68K_CPPFLAGS) -misc_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += misc$(LIB_VARIANT).rel endif ## -- @@ -74,7 +53,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h endif -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3