diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-09 15:38:50 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-09 15:38:50 +0000 |
commit | 8865bbf76a920d4e1291a6d6bfa726bbbc908a60 (patch) | |
tree | b88664c28ece90b2bea98d69da11884df0961c8a /c/src/lib/libbsp/mips64orion/p4000 | |
parent | 2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-8865bbf76a920d4e1291a6d6bfa726bbbc908a60.tar.bz2 |
2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* start/Makefile.am: Misc cleanups and fixes.
* startup/Makefile.am: Misc cleanups and fixes.
* wrapup/Makefile.am: Misc cleanups and fixes.
Diffstat (limited to 'c/src/lib/libbsp/mips64orion/p4000')
4 files changed, 21 insertions, 25 deletions
diff --git a/c/src/lib/libbsp/mips64orion/p4000/ChangeLog b/c/src/lib/libbsp/mips64orion/p4000/ChangeLog index f796906209..728563bb96 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/ChangeLog +++ b/c/src/lib/libbsp/mips64orion/p4000/ChangeLog @@ -1,3 +1,9 @@ +2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * start/Makefile.am: Misc cleanups and fixes. + * startup/Makefile.am: Misc cleanups and fixes. + * wrapup/Makefile.am: Misc cleanups and fixes. + 2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Add preinstallation dirstamp support. diff --git a/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.am b/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.am index 9641f42059..5911120025 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.am +++ b/c/src/lib/libbsp/mips64orion/p4000/start/Makefile.am @@ -9,23 +9,15 @@ OBJS = $(S_O_FILES) include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am +include $(top_srcdir)/../../bspstart.am # # (OPTIONAL) Add local stuff here using += # -install-data-local: $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - @$(mkinstalldirs) $(DESTDIR)$(bsplibdir) - $(INSTALL_DATA) $< $(DESTDIR)$(bsplibdir) +install-data-local: ${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT) -$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES) - -.PRECIOUS: $(ARCH)/start.$(OBJEXT) +all-local: $(TMPINSTALL_FILES) EXTRA_DIST = start.S diff --git a/c/src/lib/libbsp/mips64orion/p4000/startup/Makefile.am b/c/src/lib/libbsp/mips64orion/p4000/startup/Makefile.am index 470514192e..706dddc406 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/startup/Makefile.am +++ b/c/src/lib/libbsp/mips64orion/p4000/startup/Makefile.am @@ -25,23 +25,21 @@ include $(top_srcdir)/../../../../automake/lib.am $(PGM): $(OBJS) $(make-rel) -bsplib_DATA = linkcmds ghlinkcmds - -$(PROJECT_RELEASE)/lib/ghlinkcmds: ghlinkcmds - $(INSTALL_DATA) $< $@ - -$(PROJECT_RELEASE)/lib/linkcmds: linkcmds - $(INSTALL_DATA) $< $@ +project_lib_DATA = linkcmds ghlinkcmds # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/ghlinkcmds \ - $(PROJECT_RELEASE)/lib/linkcmds - -all-local: $(OBJS) $(PGM) $(TMPINSTALL_FILES) -.PRECIOUS: $(PGM) +all-local: $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = bspclean.c bspstart.c ghlinkcmds idtmem.S idttlb.S inittlb.c \ linkcmds setvec.c +${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds + +${PROJECT_RELEASE}/lib/ghlinkcmds: ghlinkcmds ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/ghlinkcmds +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/ghlinkcmds + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips64orion/p4000/wrapup/Makefile.am b/c/src/lib/libbsp/mips64orion/p4000/wrapup/Makefile.am index 0cc8182bdd..8ffbffdabd 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/wrapup/Makefile.am +++ b/c/src/lib/libbsp/mips64orion/p4000/wrapup/Makefile.am @@ -6,8 +6,8 @@ BSP_FILES = startup console liblnk CPU_FILES = clock timer # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(foreach piece, $(CPU_FILES), \ +OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(foreach piece, $(CPU_FILES), \ ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a |