From 00f71e2090279446d8df93fa1a00df129edacee3 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 17 Jan 2004 05:43:38 +0000 Subject: 2004-01-17 Ralf Corsepius * configure.ac: Require automake 1.8.2. Add subdir-objects to AUTOMAKE_OPTIONS. Add AM_PROG_CC_C_0. * Makefile.am: Use automake compilation rules. --- c/src/lib/libcpu/sh/sh7032/ChangeLog | 7 ++ c/src/lib/libcpu/sh/sh7032/Makefile.am | 110 ++++++++++++++++++-------------- c/src/lib/libcpu/sh/sh7032/configure.ac | 4 +- c/src/lib/libcpu/sh/sh7045/ChangeLog | 7 ++ c/src/lib/libcpu/sh/sh7045/Makefile.am | 90 ++++++++++++++------------ c/src/lib/libcpu/sh/sh7045/configure.ac | 4 +- c/src/lib/libcpu/sh/sh7750/ChangeLog | 7 ++ c/src/lib/libcpu/sh/sh7750/Makefile.am | 92 ++++++++++++++------------ c/src/lib/libcpu/sh/sh7750/configure.ac | 4 +- 9 files changed, 187 insertions(+), 138 deletions(-) (limited to 'c') diff --git a/c/src/lib/libcpu/sh/sh7032/ChangeLog b/c/src/lib/libcpu/sh/sh7032/ChangeLog index cdeda554e5..8f48966a8d 100644 --- a/c/src/lib/libcpu/sh/sh7032/ChangeLog +++ b/c/src/lib/libcpu/sh/sh7032/ChangeLog @@ -1,3 +1,10 @@ +2004-01-17 Ralf Corsepius + + * configure.ac: Require automake 1.8.2. + Add subdir-objects to AUTOMAKE_OPTIONS. + Add AM_PROG_CC_C_0. + * Makefile.am: Use automake compilation rules. + 2004-01-14 Ralf Corsepius * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libcpu/sh/sh7032/Makefile.am b/c/src/lib/libcpu/sh/sh7032/Makefile.am index fbae5b81cb..af7ab5de95 100644 --- a/c/src/lib/libcpu/sh/sh7032/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/Makefile.am @@ -7,6 +7,10 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am +CLEANFILES = +EXTRA_PROGRAMS = +noinst_DATA = + # NOTE: Unlike other CPUS, we install into a subdirectory to avoid # file name conflicts include_shdir = $(includedir)/sh @@ -16,73 +20,81 @@ include_sh_HEADERS = include/sci.h include/sh7_pfc.h include/sh7_sci.h include_rtems_score_HEADERS = include/ispsh7032.h include/iosh7032.h # clock +EXTRA_PROGRAMS += clock.rel +CLEANFILES += clock.rel +clock_rel_SOURCES = clock/ckinit.c +clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -PGMS = $(ARCH)/clock.rel - -clock_C_FILES = clock/ckinit.c -clock_rel_OBJECTS = $(clock_C_FILES:clock/%.c=$(ARCH)/%.$(OBJEXT)) -EXTRA_DIST = $(clock_C_FILES) +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) -${ARCH}/%.$(OBJEXT): clock/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -${ARCH}/clock.rel: $(clock_rel_OBJECTS) - ${make-rel} +noinst_DATA += clock$(LIB_VARIANT).rel # delay +EXTRA_PROGRAMS += delay.rel +CLEANFILES += delay.rel +delay_rel_SOURCES = delay/delay.c +delay_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +delay_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -PGMS += $(ARCH)/delay.rel +EXTRA_PROGRAMS += delay_g.rel +CLEANFILES += delay_g.rel +delay_g_rel_SOURCES = $(delay_rel_SOURCES) +delay_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +delay_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -delay_C_FILES = delay/delay.c -delay_rel_OBJECTS = $(delay_C_FILES:delay/%.c=$(ARCH)/%.$(OBJEXT)) -EXTRA_DIST += $(delay_C_FILES) - -${ARCH}/%.$(OBJEXT): delay/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -${ARCH}/delay.rel: $(delay_rel_OBJECTS) - ${make-rel} +noinst_DATA += delay$(LIB_VARIANT).rel # sci +EXTRA_PROGRAMS += sci.rel +CLEANFILES += sci.rel +sci_rel_SOURCES = sci/sci.c +sci_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +sci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -PGMS += $(ARCH)/sci.rel - -sci_C_FILES = sci/sci.c -sci_rel_OBJECTS = $(sci_C_FILES:sci/%.c=$(ARCH)/%.$(OBJEXT)) -EXTRA_DIST += $(sci_C_FILES) +EXTRA_PROGRAMS += sci_g.rel +CLEANFILES += sci_g.rel +sci_g_rel_SOURCES = $(sci_rel_SOURCES) +sci_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +sci_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -${ARCH}/%.$(OBJEXT): sci/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -${ARCH}/sci.rel: $(sci_rel_OBJECTS) - ${make-rel} +noinst_DATA += sci$(LIB_VARIANT).rel # score +EXTRA_PROGRAMS += score.rel +CLEANFILES += score.rel +score_rel_SOURCES =score/cpu_asm.c score/ispsh7032.c +score_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -PGMS += $(ARCH)/score.rel +EXTRA_PROGRAMS += score_g.rel +CLEANFILES += score_g.rel +score_g_rel_SOURCES = $(score_rel_SOURCES) +score_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +score_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -score_C_FILES = score/cpu_asm.c score/ispsh7032.c -score_rel_OBJECTS = $(score_C_FILES:score/%.c=$(ARCH)/%.$(OBJEXT)) -EXTRA_DIST += $(score_C_FILES) - -${ARCH}/%.$(OBJEXT): score/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -${ARCH}/score.rel: $(score_rel_OBJECTS) - ${make-rel} +noinst_DATA += score$(LIB_VARIANT).rel ## timer +EXTRA_PROGRAMS += timer.rel +CLEANFILES += timer.rel +timer_rel_SOURCES = timer/timer.c +timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -PGMS += $(ARCH)/timer.rel - -timer_C_FILES = timer/timer.c -timer_rel_OBJECTS = $(timer_C_FILES:timer/%.c=$(ARCH)/%.$(OBJEXT)) -EXTRA_DIST += $(timer_C_FILES) - -${ARCH}/%.$(OBJEXT): timer/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -${ARCH}/timer.rel: $(timer_rel_OBJECTS) - ${make-rel} +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) -all-local: $(PGMS) $(TMPINSTALL_FILES) +noinst_DATA += timer$(LIB_VARIANT).rel -.PRECIOUS: $(PGMS) +all-local: $(PREINSTALL_FILES) PREINSTALL_FILES = @@ -116,6 +128,6 @@ $(PROJECT_INCLUDE)/rtems/score/iosh7032.h: include/iosh7032.h $(PROJECT_INCLUDE) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7032.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7032.h -CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(PREINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7032/configure.ac b/c/src/lib/libcpu/sh/sh7032/configure.ac index 88ba46e015..434a1fba22 100644 --- a/c/src/lib/libcpu/sh/sh7032/configure.ac +++ b/c/src/lib/libcpu/sh/sh7032/configure.ac @@ -9,16 +9,16 @@ RTEMS_TOP(../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define foreign 1.8]) +AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8.2]) AM_MAINTAINER_MODE RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP - RTEMS_PROJECT_ROOT RTEMS_PROG_CC_FOR_TARGET +AM_PROG_CC_C_O RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) diff --git a/c/src/lib/libcpu/sh/sh7045/ChangeLog b/c/src/lib/libcpu/sh/sh7045/ChangeLog index 84b8720796..98f9de7798 100644 --- a/c/src/lib/libcpu/sh/sh7045/ChangeLog +++ b/c/src/lib/libcpu/sh/sh7045/ChangeLog @@ -1,3 +1,10 @@ +2004-01-17 Ralf Corsepius + + * configure.ac: Require automake 1.8.2. + Add subdir-objects to AUTOMAKE_OPTIONS. + Add AM_PROG_CC_C_0. + * Makefile.am: Use automake compilation rules. + 2004-01-14 Ralf Corsepius * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libcpu/sh/sh7045/Makefile.am b/c/src/lib/libcpu/sh/sh7045/Makefile.am index 9dbf7a179c..7bcb1d200a 100644 --- a/c/src/lib/libcpu/sh/sh7045/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/Makefile.am @@ -7,6 +7,10 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am +CLEANFILES = +EXTRA_PROGRAMS = +noinst_DATA = + # NOTE: Unlike other CPUS, we install into a subdirectory to avoid # file name conflicts include_shdir = $(includedir)/sh @@ -17,60 +21,64 @@ include_sh_HEADERS = include/io_types.h include/sci.h include/sh7_pfc.h \ include_rtems_score_HEADERS = include/ispsh7045.h include/iosh7045.h # clock +EXTRA_PROGRAMS += clock.rel +CLEANFILES += clock.rel +clock_rel_SOURCES = clock/ckinit.c +clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -PGMS = $(ARCH)/clock.rel - -clock_C_FILES = clock/ckinit.c -clock_rel_OBJECTS = $(clock_C_FILES:clock/%.c=$(ARCH)/%.$(OBJEXT)) -EXTRA_DIST = $(clock_C_FILES) +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) -${ARCH}/%.$(OBJEXT): clock/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -${ARCH}/clock.rel: $(clock_rel_OBJECTS) - ${make-rel} +noinst_DATA += clock$(LIB_VARIANT).rel # sci +EXTRA_PROGRAMS += sci.rel +CLEANFILES += sci.rel +sci_rel_SOURCES = sci/sci.c sci/sci_termios.c +sci_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +sci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -PGMS += $(ARCH)/sci.rel +EXTRA_PROGRAMS += sci_g.rel +CLEANFILES += sci_g.rel +sci_g_rel_SOURCES = $(sci_rel_SOURCES) +sci_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +sci_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -sci_C_FILES = sci/sci.c sci/sci_termios.c -sci_rel_OBJECTS = $(sci_C_FILES:sci/%.c=$(ARCH)/%.$(OBJEXT)) -EXTRA_DIST += $(sci_C_FILES) - -${ARCH}/%.$(OBJEXT): sci/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -${ARCH}/sci.rel: $(sci_rel_OBJECTS) - ${make-rel} +noinst_DATA += sci$(LIB_VARIANT).rel # score +EXTRA_PROGRAMS += score.rel +CLEANFILES += score.rel +score_rel_SOURCES = score/cpu_asm.c score/ispsh7045.c +score_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -PGMS += $(ARCH)/score.rel - -score_C_FILES = score/cpu_asm.c score/ispsh7045.c -score_rel_OBJECTS = $(score_C_FILES:score/%.c=$(ARCH)/%.$(OBJEXT)) -EXTRA_DIST += $(score_C_FILES) +EXTRA_PROGRAMS += score_g.rel +CLEANFILES += score_g.rel +score_g_rel_SOURCES = $(score_rel_SOURCES) +score_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +score_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -${ARCH}/%.$(OBJEXT): score/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -${ARCH}/score.rel: $(score_rel_OBJECTS) - ${make-rel} +noinst_DATA += score$(LIB_VARIANT).rel ## timer +EXTRA_PROGRAMS += timer.rel +CLEANFILES += timer.rel +timer_rel_SOURCES = timer/timer.c +timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -PGMS += $(ARCH)/timer.rel - -timer_C_FILES = timer/timer.c -timer_rel_OBJECTS = $(timer_C_FILES:timer/%.c=$(ARCH)/%.$(OBJEXT)) -EXTRA_DIST += $(timer_C_FILES) - -${ARCH}/%.$(OBJEXT): timer/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -${ARCH}/timer.rel: $(timer_rel_OBJECTS) - ${make-rel} - -all-local: $(PGMS) $(TMPINSTALL_FILES) +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) -.PRECIOUS: $(PGMS) +noinst_DATA += timer$(LIB_VARIANT).rel PREINSTALL_FILES = @@ -112,6 +120,6 @@ $(PROJECT_INCLUDE)/rtems/score/iosh7045.h: include/iosh7045.h $(PROJECT_INCLUDE) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7045.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7045.h -CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(PREINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/configure.ac b/c/src/lib/libcpu/sh/sh7045/configure.ac index 0a0d01b024..8b015ead48 100644 --- a/c/src/lib/libcpu/sh/sh7045/configure.ac +++ b/c/src/lib/libcpu/sh/sh7045/configure.ac @@ -9,16 +9,16 @@ RTEMS_TOP(../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define foreign 1.8]) +AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8.2]) AM_MAINTAINER_MODE RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP - RTEMS_PROJECT_ROOT RTEMS_PROG_CC_FOR_TARGET +AM_PROG_CC_C_O RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) diff --git a/c/src/lib/libcpu/sh/sh7750/ChangeLog b/c/src/lib/libcpu/sh/sh7750/ChangeLog index 3c8fc67861..8d44eae3bd 100644 --- a/c/src/lib/libcpu/sh/sh7750/ChangeLog +++ b/c/src/lib/libcpu/sh/sh7750/ChangeLog @@ -1,3 +1,10 @@ +2004-01-17 Ralf Corsepius + + * configure.ac: Require automake 1.8.2. + Add subdir-objects to AUTOMAKE_OPTIONS. + Add AM_PROG_CC_C_0. + * Makefile.am: Use automake compilation rules. + 2004-01-14 Ralf Corsepius * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libcpu/sh/sh7750/Makefile.am b/c/src/lib/libcpu/sh/sh7750/Makefile.am index 44456183f0..2314f70f21 100644 --- a/c/src/lib/libcpu/sh/sh7750/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7750/Makefile.am @@ -7,6 +7,10 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am +CLEANFILES = +EXTRA_PROGRAMS = +noinst_DATA = + # NOTE: Unlike other CPUS, we install into a subdirectory to avoid # file name conflicts include_shdir = $(includedir)/sh @@ -17,65 +21,69 @@ include_rtems_score_HEADERS = include/rtems/score/sh7750_regs.h \ include/rtems/score/ipl.h include/rtems/score/iosh7750.h \ include/rtems/score/ispsh7750.h include/rtems/score/sh4_regs.h -all-local: $(TMPINSTALL_FILES) - ## clock +EXTRA_PROGRAMS += clock.rel +CLEANFILES += clock.rel +clock_rel_SOURCES = clock/ckinit.c +clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -PGMS = $(ARCH)/clock.rel +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) -clock_C_FILES = clock/ckinit.c -clock_rel_OBJECTS = $(clock_C_FILES:clock/%.c=$(ARCH)/%.$(OBJEXT)) -EXTRA_DIST = $(clock_C_FILES) - -${ARCH}/%.$(OBJEXT): clock/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -${ARCH}/clock.rel: $(clock_rel_OBJECTS) - ${make-rel} +noinst_DATA += clock$(LIB_VARIANT).rel ## sci +EXTRA_PROGRAMS += sci.rel +CLEANFILES += sci.rel +sci_rel_SOURCES = sci/sh4uart.c +sci_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +sci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -PGMS += $(ARCH)/sci.rel - -sci_C_FILES = sci/sh4uart.c -sci_rel_OBJECTS = $(sci_C_FILES:sci/%.c=$(ARCH)/%.$(OBJEXT)) -EXTRA_DIST += $(sci_C_FILES) +EXTRA_PROGRAMS += sci_g.rel +CLEANFILES += sci_g.rel +sci_g_rel_SOURCES = $(sci_rel_SOURCES) +sci_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +sci_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -${ARCH}/%.$(OBJEXT): sci/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -${ARCH}/sci.rel: $(sci_rel_OBJECTS) - ${make-rel} +noinst_DATA += sci$(LIB_VARIANT).rel ## score +EXTRA_PROGRAMS += score.rel +CLEANFILES += score.rel +score_rel_SOURCES = score/cpu_asm.c score/ispsh7750.c +score_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -PGMS += $(ARCH)/score.rel +EXTRA_PROGRAMS += score_g.rel +CLEANFILES += score_g.rel +score_g_rel_SOURCES = $(score_rel_SOURCES) +score_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +score_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -score_C_FILES = score/cpu_asm.c score/ispsh7750.c -score_rel_OBJECTS = $(score_C_FILES:score/%.c=$(ARCH)/%.$(OBJEXT)) -EXTRA_DIST += $(score_C_FILES) - -${ARCH}/%.$(OBJEXT): score/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -${ARCH}/score.rel: $(score_rel_OBJECTS) - ${make-rel} +noinst_DATA += score$(LIB_VARIANT).rel ## timer +EXTRA_PROGRAMS += timer.rel +CLEANFILES += timer.rel +timer_rel_SOURCES = timer/timer.c +timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -PGMS += $(ARCH)/timer.rel - -timer_C_FILES = timer/timer.c -timer_rel_OBJECTS = $(timer_C_FILES:timer/%.c=$(ARCH)/%.$(OBJEXT)) -EXTRA_DIST += $(timer_C_FILES) +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) -${ARCH}/%.$(OBJEXT): timer/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -${ARCH}/timer.rel: $(timer_rel_OBJECTS) - ${make-rel} +noinst_DATA += timer$(LIB_VARIANT).rel # -- -all-local: $(PGMS) $(TMPINSTALL_FILES) - -.PRECIOUS: $(PGMS) +all-local: $(PREINSTALL_FILES) PREINSTALL_FILES = @@ -113,6 +121,6 @@ $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h: include/rtems/score/sh4_regs.h $(PROJ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h -CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(PREINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7750/configure.ac b/c/src/lib/libcpu/sh/sh7750/configure.ac index a0edaf4a82..ee185d654c 100644 --- a/c/src/lib/libcpu/sh/sh7750/configure.ac +++ b/c/src/lib/libcpu/sh/sh7750/configure.ac @@ -9,16 +9,16 @@ RTEMS_TOP(../../../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define foreign 1.8]) +AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.8.2]) AM_MAINTAINER_MODE RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP - RTEMS_PROJECT_ROOT RTEMS_PROG_CC_FOR_TARGET +AM_PROG_CC_C_O RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -- cgit v1.2.3