diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-21 07:37:53 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-21 07:37:53 +0000 |
| commit | 7984a69ae9bd154065a66908bfe20382f8f25aaa (patch) | |
| tree | 28198510d065d73a183c334bcd63a4de8df1a065 /c/src/lib/libbsp/sh/gensh4 | |
| parent | 2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-7984a69ae9bd154065a66908bfe20382f8f25aaa.tar.bz2 | |
2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add PREINSTALL_DIRS.
* wrapup/Makefile.am: Reflect changes to libcpu.
Diffstat (limited to 'c/src/lib/libbsp/sh/gensh4')
| -rw-r--r-- | c/src/lib/libbsp/sh/gensh4/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sh/gensh4/Makefile.am | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sh/gensh4/wrapup/Makefile.am | 9 |
3 files changed, 11 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/sh/gensh4/ChangeLog b/c/src/lib/libbsp/sh/gensh4/ChangeLog index 0db6185cd1..c372c3adca 100644 --- a/c/src/lib/libbsp/sh/gensh4/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh4/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add PREINSTALL_DIRS. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * startup/Makefile.am: Remove bogus EXTRA_DIST. diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am index b9ea1d120a..3e460ec02b 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am @@ -24,6 +24,7 @@ all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = times +PREINSTALL_DIRS = TMPINSTALL_FILES = $(PROJECT_INCLUDE)/sdram.h: include/sdram.h $(PROJECT_INCLUDE)/$(dirstamp) @@ -39,6 +40,7 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJE TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/sh/gensh4/wrapup/Makefile.am b/c/src/lib/libbsp/sh/gensh4/wrapup/Makefile.am index df2ee91b6c..2d3a213284 100644 --- a/c/src/lib/libbsp/sh/gensh4/wrapup/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/wrapup/Makefile.am @@ -6,13 +6,12 @@ BSP_PIECES = startup hw_init console -# pieces to pick up out of libcpu/sh/sh7750 -CPU_PIECES = clock sci timer score - # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ - $(foreach piece, $(CPU_PIECES), \ - ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/$(piece)$(LIB_VARIANT).rel) + ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/sci$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am |