From ec1898b266796d513557e3ba0341b15622f067c7 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 16 Jan 2003 10:52:19 +0000 Subject: 2003-01-16 Ralf Corsepius * Makefile.am: Merge-in subdir Makefile.ams * configure.ac: Reflect changes above. * score/Makefile.am: Removed. * sci/Makefile.am: Removed. * timer/Makefile.am: Removed. * clock/Makefile.am: Removed. --- c/src/lib/libcpu/sh/sh7045/ChangeLog | 11 ++++- c/src/lib/libcpu/sh/sh7045/Makefile.am | 62 ++++++++++++++++++++++++++-- c/src/lib/libcpu/sh/sh7045/clock/Makefile.am | 27 ------------ c/src/lib/libcpu/sh/sh7045/configure.ac | 6 +-- c/src/lib/libcpu/sh/sh7045/sci/Makefile.am | 27 ------------ c/src/lib/libcpu/sh/sh7045/score/Makefile.am | 27 ------------ c/src/lib/libcpu/sh/sh7045/timer/Makefile.am | 27 ------------ 7 files changed, 69 insertions(+), 118 deletions(-) delete mode 100644 c/src/lib/libcpu/sh/sh7045/clock/Makefile.am delete mode 100644 c/src/lib/libcpu/sh/sh7045/sci/Makefile.am delete mode 100644 c/src/lib/libcpu/sh/sh7045/score/Makefile.am delete mode 100644 c/src/lib/libcpu/sh/sh7045/timer/Makefile.am (limited to 'c') diff --git a/c/src/lib/libcpu/sh/sh7045/ChangeLog b/c/src/lib/libcpu/sh/sh7045/ChangeLog index 66add8ae94..ecbb1371af 100644 --- a/c/src/lib/libcpu/sh/sh7045/ChangeLog +++ b/c/src/lib/libcpu/sh/sh7045/ChangeLog @@ -1,4 +1,13 @@ -2002-01-15 Ralf Corsepius +2003-01-16 Ralf Corsepius + + * Makefile.am: Merge-in subdir Makefile.ams + * configure.ac: Reflect changes above. + * score/Makefile.am: Removed. + * sci/Makefile.am: Removed. + * timer/Makefile.am: Removed. + * clock/Makefile.am: Removed. + +2003-01-15 Ralf Corsepius * sci/Makefile.am: Apply 2002-12-14 patch (Apparently dropped by CVS). * score/Makefile.am: Likewise. diff --git a/c/src/lib/libcpu/sh/sh7045/Makefile.am b/c/src/lib/libcpu/sh/sh7045/Makefile.am index 89e57442d7..f7dd968aed 100644 --- a/c/src/lib/libcpu/sh/sh7045/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/Makefile.am @@ -4,7 +4,8 @@ ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = . score clock sci timer +include $(top_srcdir)/../../../../../../automake/compile.am +include $(top_srcdir)/../../../../../../automake/lib.am # NOTE: Unlike other CPUS, we install into a subdirectory to avoid # file name conflicts @@ -24,11 +25,64 @@ $(PROJECT_INCLUDE)/sh/%.h: include/%.h $(PROJECT_INCLUDE)/rtems/score/%.h: include/%.h $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES = $(PROJECT_INCLUDE)/sh \ +PREINSTALL_FILES = $(PROJECT_INCLUDE)/sh \ $(include_sh_HEADERS:include/%=$(PROJECT_INCLUDE)/sh/%) \ $(include_rtems_score_HEADERS:include/%=$(PROJECT_INCLUDE)/rtems/score/%) -all-local: $(TMPINSTALL_FILES) +# clock + +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) + +${ARCH}/%.$(OBJEXT): clock/%.c + ${COMPILE} -o $@ -c $< +${ARCH}/clock.rel: $(clock_rel_OBJECTS) + ${make-rel} + +# sci + +PGMS += $(ARCH)/sci.rel + +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 + ${COMPILE} -o $@ -c $< +${ARCH}/sci.rel: $(sci_rel_OBJECTS) + ${make-rel} + +# score + +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) + +${ARCH}/%.$(OBJEXT): score/%.c + ${COMPILE} -o $@ -c $< +${ARCH}/score.rel: $(score_rel_OBJECTS) + ${make-rel} + +## timer + +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 + ${COMPILE} -o $@ -c $< +${ARCH}/timer.rel: $(timer_rel_OBJECTS) + ${make-rel} + +all-local: $(ARCH) $(PGMS) $(TMPINSTALL_FILES) + +.PRECIOUS: $(PGMS) -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am b/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am deleted file mode 100644 index 46b0b5e0df..0000000000 --- a/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## -## $Id$ -## - - -PGM = $(ARCH)/clock.rel - -C_FILES = ckinit.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../../../../automake/compile.am -include $(top_srcdir)/../../../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -all-local: $(ARCH) $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = ckinit.c - -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 1ff47f1b16..74a3a20a97 100644 --- a/c/src/lib/libcpu/sh/sh7045/configure.ac +++ b/c/src/lib/libcpu/sh/sh7045/configure.ac @@ -27,9 +27,5 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -clock/Makefile -score/Makefile -sci/Makefile -timer/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am b/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am deleted file mode 100644 index 47db676718..0000000000 --- a/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## -## $Id$ -## - - -PGM = $(ARCH)/sci.rel - -C_FILES = sci.c sci_termios.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../../../../automake/compile.am -include $(top_srcdir)/../../../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -all-local: $(ARCH) $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = sci.c sci_termios.c - -include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/score/Makefile.am b/c/src/lib/libcpu/sh/sh7045/score/Makefile.am deleted file mode 100644 index 47d5a0de00..0000000000 --- a/c/src/lib/libcpu/sh/sh7045/score/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## -## $Id$ -## - - -PGM = $(ARCH)/score.rel - -C_FILES = cpu_asm.c ispsh7045.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../../../../automake/compile.am -include $(top_srcdir)/../../../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -all-local: $(ARCH) $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = ispsh7045.c - -include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am b/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am deleted file mode 100644 index 40aac3426c..0000000000 --- a/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## -## $Id$ -## - - -PGM = $(ARCH)/timer.rel - -C_FILES = timer.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../../../../automake/compile.am -include $(top_srcdir)/../../../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -all-local: $(ARCH) $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = timer.c - -include $(top_srcdir)/../../../../../../automake/local.am -- cgit v1.2.3