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/gen68340 | |
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/gen68340')
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/start/Makefile.am | 18 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am | 14 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am | 4 |
4 files changed, 21 insertions, 21 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index 0c8b0085fd..eba34ff4be 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/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/gen68340/start/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/start/Makefile.am index 9e9874dbf9..7e1dca2d4c 100644 --- a/c/src/lib/libbsp/m68k/gen68340/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/start/Makefile.am @@ -9,24 +9,20 @@ 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) $< $@ - -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 startfor340only.S +${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/gen68340/startup/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am index 1fd7eb2dae..4cd5208f46 100644 --- a/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am @@ -23,18 +23,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 = bspclean.c bspstart.c dumpanic.c init68340.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/gen68340/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am index 925d05c3e2..049c7413ec 100644 --- a/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am @@ -5,8 +5,8 @@ BSP_PIECES = startup clock console timer # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ - ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) \ $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) |