diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-10 12:37:33 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-10 12:37:33 +0000 |
commit | 4d5d97b3aefd1bff1c1222b95942ff1c5595bec1 (patch) | |
tree | d1d4d5eddf1e38f943f17591256d77a2e5cc36d8 /c/src/lib/libbsp/m68k/mvme147s | |
parent | 2003-12-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-4d5d97b3aefd1bff1c1222b95942ff1c5595bec1.tar.bz2 |
2003-12-10 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/m68k/mvme147s')
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am | 16 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am | 14 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am | 8 |
4 files changed, 22 insertions, 22 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog index 8ae4e0a182..113e932686 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog @@ -1,3 +1,9 @@ +2003-12-10 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/m68k/mvme147s/start/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am index 1082c32802..fa4e05cca4 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am @@ -11,22 +11,18 @@ 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) +project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) -$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT) - $(INSTALL_DATA) $< $@ +all-local: $(TMPINSTALL_FILES) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - -all-local: $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES) - -.PRECIOUS: $(ARCH)/start.$(OBJEXT) +${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am index d3e281aa97..4654adc774 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am @@ -22,18 +22,16 @@ include $(top_srcdir)/../../../../automake/lib.am $(PGM): $(OBJS) $(make-rel) -bsplib_DATA = linkcmds - -$(PROJECT_RELEASE)/lib/linkcmds: linkcmds - $(INSTALL_DATA) $< $@ +project_lib_DATA = linkcmds # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds - -all-local: $(OBJS) $(PGM) $(TMPINSTALL_FILES) -.PRECIOUS: $(PGM) +all-local: $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = bspstart.c linkcmds +${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp) + $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds +TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds + include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am index 4ec222828e..c69d351138 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am @@ -16,10 +16,10 @@ endif BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES) # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) $(foreach \ - piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ + $(foreach piece, $(GENERIC_PIECES), \ + ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a # |